From b165d2dda9dcd9ce2b436ed4545e81dac81e187e Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 16 Feb 2022 10:52:31 -0800 Subject: [PATCH] [python-experimental] fn + method signature improvements (#11529) * Updates code * Removes java files --- .../python-experimental/api_client.handlebars | 4 +- .../imports_schema_types.handlebars | 2 +- .../model_templates/new.handlebars | 4 +- .../python-experimental/schemas.handlebars | 575 ++++++++++-------- .../call_123_test_special_tags.py | 2 +- .../api/default_api_endpoints/foo_get.py | 2 +- ...ditional_properties_with_array_of_enums.py | 2 +- .../api/fake_api_endpoints/array_model.py | 2 +- .../api/fake_api_endpoints/array_of_enums.py | 2 +- .../body_with_file_schema.py | 2 +- .../body_with_query_params.py | 2 +- .../api/fake_api_endpoints/boolean.py | 2 +- .../case_sensitive_params.py | 2 +- .../api/fake_api_endpoints/client_model.py | 2 +- .../composed_one_of_different_types.py | 2 +- .../fake_api_endpoints/endpoint_parameters.py | 6 +- .../api/fake_api_endpoints/enum_parameters.py | 6 +- .../api/fake_api_endpoints/fake_health_get.py | 2 +- .../fake_api_endpoints/group_parameters.py | 2 +- .../inline_additional_properties.py | 6 +- .../fake_api_endpoints/inline_composition.py | 38 +- .../api/fake_api_endpoints/json_form_data.py | 6 +- .../api/fake_api_endpoints/mammal.py | 2 +- .../number_with_validations.py | 2 +- .../object_model_with_ref_props.py | 2 +- .../parameter_collisions.py | 2 +- .../query_parameter_collection_format.py | 2 +- .../api/fake_api_endpoints/string.py | 2 +- .../api/fake_api_endpoints/string_enum.py | 2 +- .../upload_download_file.py | 2 +- .../api/fake_api_endpoints/upload_file.py | 6 +- .../api/fake_api_endpoints/upload_files.py | 6 +- .../classname.py | 2 +- .../classname.py | 2 +- .../api/pet_api_endpoints/add_pet.py | 2 +- .../api/pet_api_endpoints/delete_pet.py | 2 +- .../pet_api_endpoints/find_pets_by_status.py | 2 +- .../pet_api_endpoints/find_pets_by_tags.py | 2 +- .../api/pet_api_endpoints/get_pet_by_id.py | 2 +- .../api/pet_api_endpoints/update_pet.py | 2 +- .../pet_api_endpoints/update_pet_with_form.py | 6 +- .../api/pet_api_endpoints/upload_file.py | 216 ------- .../upload_file_with_required_file.py | 6 +- .../api/pet_api_endpoints/upload_image.py | 6 +- .../api/store_api_endpoints/delete_order.py | 2 +- .../api/store_api_endpoints/get_inventory.py | 6 +- .../store_api_endpoints/get_order_by_id.py | 2 +- .../api/store_api_endpoints/place_order.py | 2 +- .../api/user_api_endpoints/create_user.py | 2 +- .../create_users_with_array_input.py | 2 +- .../create_users_with_list_input.py | 2 +- .../api/user_api_endpoints/delete_user.py | 2 +- .../user_api_endpoints/get_user_by_name.py | 2 +- .../api/user_api_endpoints/login_user.py | 2 +- .../api/user_api_endpoints/logout_user.py | 2 +- .../api/user_api_endpoints/update_user.py | 2 +- .../petstore_api/api_client.py | 4 +- .../model/additional_properties_class.py | 26 +- ...ditional_properties_with_array_of_enums.py | 6 +- .../petstore_api/model/address.py | 6 +- .../petstore_api/model/animal.py | 6 +- .../petstore_api/model/animal_farm.py | 2 +- .../petstore_api/model/api_response.py | 6 +- .../petstore_api/model/apple.py | 6 +- .../petstore_api/model/apple_req.py | 6 +- .../model/array_holding_any_type.py | 2 +- .../model/array_of_array_of_number_only.py | 6 +- .../petstore_api/model/array_of_enums.py | 2 +- .../model/array_of_number_only.py | 6 +- .../petstore_api/model/array_test.py | 6 +- .../model/array_with_validations_in_items.py | 2 +- .../petstore_api/model/banana.py | 6 +- .../petstore_api/model/banana_req.py | 6 +- .../petstore_api/model/bar.py | 2 +- .../petstore_api/model/basque_pig.py | 6 +- .../petstore_api/model/boolean.py | 2 +- .../petstore_api/model/boolean_enum.py | 2 +- .../petstore_api/model/capitalization.py | 6 +- .../petstore_api/model/cat.py | 6 +- .../petstore_api/model/cat_all_of.py | 6 +- .../petstore_api/model/category.py | 6 +- .../petstore_api/model/child_cat.py | 6 +- .../petstore_api/model/child_cat_all_of.py | 6 +- .../petstore_api/model/class_model.py | 6 +- .../petstore_api/model/client.py | 6 +- .../model/complex_quadrilateral.py | 6 +- .../model/complex_quadrilateral_all_of.py | 6 +- ...d_any_of_different_types_no_validations.py | 6 +- .../petstore_api/model/composed_array.py | 2 +- .../petstore_api/model/composed_bool.py | 6 +- .../petstore_api/model/composed_none.py | 6 +- .../petstore_api/model/composed_number.py | 6 +- .../petstore_api/model/composed_object.py | 6 +- .../model/composed_one_of_different_types.py | 10 +- .../petstore_api/model/composed_string.py | 6 +- .../model/composition_in_property.py | 10 +- .../petstore_api/model/currency.py | 2 +- .../petstore_api/model/danish_pig.py | 6 +- .../petstore_api/model/date_time_test.py | 2 +- .../model/date_time_with_validations.py | 2 +- .../model/date_with_validations.py | 2 +- .../petstore_api/model/decimal_payload.py | 2 +- .../petstore_api/model/dog.py | 6 +- .../petstore_api/model/dog_all_of.py | 6 +- .../petstore_api/model/drawing.py | 6 +- .../petstore_api/model/enum_arrays.py | 6 +- .../petstore_api/model/enum_class.py | 2 +- .../petstore_api/model/enum_test.py | 6 +- .../model/equilateral_triangle.py | 6 +- .../model/equilateral_triangle_all_of.py | 6 +- .../petstore_api/model/file.py | 6 +- .../model/file_schema_test_class.py | 6 +- .../petstore_api/model/foo.py | 6 +- .../petstore_api/model/format_test.py | 6 +- .../petstore_api/model/fruit.py | 6 +- .../petstore_api/model/fruit_req.py | 6 +- .../petstore_api/model/gm_fruit.py | 6 +- .../petstore_api/model/grandparent_animal.py | 6 +- .../petstore_api/model/has_only_read_only.py | 6 +- .../petstore_api/model/health_check_result.py | 10 +- .../model/inline_response_default.py | 6 +- .../petstore_api/model/integer_enum.py | 2 +- .../petstore_api/model/integer_enum_big.py | 2 +- .../model/integer_enum_one_value.py | 2 +- .../model/integer_enum_with_default_value.py | 2 +- .../petstore_api/model/integer_max10.py | 2 +- .../petstore_api/model/integer_min15.py | 2 +- .../petstore_api/model/isosceles_triangle.py | 6 +- .../model/isosceles_triangle_all_of.py | 6 +- .../petstore_api/model/mammal.py | 6 +- .../petstore_api/model/map_test.py | 22 +- ...perties_and_additional_properties_class.py | 10 +- .../petstore_api/model/model200_response.py | 6 +- .../petstore_api/model/model_return.py | 6 +- .../petstore_api/model/money.py | 6 +- .../petstore_api/model/name.py | 6 +- .../model/no_additional_properties.py | 6 +- .../petstore_api/model/nullable_class.py | 66 +- .../petstore_api/model/nullable_shape.py | 6 +- .../petstore_api/model/nullable_string.py | 6 +- .../petstore_api/model/number.py | 2 +- .../petstore_api/model/number_only.py | 6 +- .../model/number_with_validations.py | 2 +- .../petstore_api/model/object_interface.py | 2 +- .../model/object_model_with_ref_props.py | 6 +- .../model/object_with_decimal_properties.py | 6 +- .../object_with_difficultly_named_props.py | 6 +- ...object_with_inline_composition_property.py | 10 +- .../model/object_with_validations.py | 6 +- .../petstore_api/model/order.py | 6 +- .../petstore_api/model/parent_pet.py | 6 +- .../petstore_api/model/pet.py | 6 +- .../petstore_api/model/pig.py | 6 +- .../petstore_api/model/player.py | 6 +- .../petstore_api/model/quadrilateral.py | 6 +- .../model/quadrilateral_interface.py | 6 +- .../petstore_api/model/read_only_first.py | 6 +- .../petstore_api/model/scalene_triangle.py | 6 +- .../model/scalene_triangle_all_of.py | 6 +- .../petstore_api/model/shape.py | 6 +- .../petstore_api/model/shape_or_null.py | 6 +- .../model/simple_quadrilateral.py | 6 +- .../model/simple_quadrilateral_all_of.py | 6 +- .../petstore_api/model/some_object.py | 6 +- .../petstore_api/model/special_model_name.py | 6 +- .../petstore_api/model/string.py | 2 +- .../petstore_api/model/string_boolean_map.py | 6 +- .../petstore_api/model/string_enum.py | 6 +- .../model/string_enum_with_default_value.py | 2 +- .../model/string_with_validation.py | 2 +- .../petstore_api/model/tag.py | 6 +- .../petstore_api/model/triangle.py | 6 +- .../petstore_api/model/triangle_interface.py | 6 +- .../petstore_api/model/user.py | 10 +- .../petstore_api/model/whale.py | 6 +- .../petstore_api/model/zebra.py | 6 +- .../petstore_api/schemas.py | 575 ++++++++++-------- .../tests_manual/test_validate.py | 327 ++++++---- 178 files changed, 1298 insertions(+), 1317 deletions(-) delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file.py diff --git a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars index ac1ed1743a57..efcd907513d4 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars @@ -31,7 +31,6 @@ from {{packageName}}.schemas import ( Schema, FileIO, BinarySchema, - InstantiationMetadata, date, datetime, none_type, @@ -807,9 +806,8 @@ class OpenApiResponse: else: raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type)) body_schema = self.content[content_type].schema - _instantiation_metadata = InstantiationMetadata(from_server=True, configuration=configuration) deserialized_body = body_schema._from_openapi_data( - body_data, _instantiation_metadata=_instantiation_metadata) + body_data, _configuration=configuration) elif streamed: response.release_conn() diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars index 3225819fd14d..cf2d2d433837 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars @@ -21,7 +21,7 @@ from {{packageName}}.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars index e74461e8043e..a05493c42e3d 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars @@ -22,7 +22,7 @@ def __new__( {{/unless}} {{/unless}} {{/each}} - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, {{#with additionalProperties}} **kwargs: typing.Type[Schema], {{/with}} @@ -46,7 +46,7 @@ def __new__( {{/unless}} {{/unless}} {{/each}} - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, {{#with additionalProperties}} **kwargs, {{/with}} diff --git a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars index 15a4b7b32156..3ebfd802cc2b 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars @@ -2,7 +2,7 @@ {{>partial_header}} -from collections import defaultdict +from collections import defaultdict, abc from datetime import date, datetime, timedelta # noqa: F401 from dataclasses import dataclass import functools @@ -63,21 +63,22 @@ def update(d: dict, u: dict): for k, v in u.items(): if not v: continue - d[k] = d[k] | v - return d + if k not in d: + d[k] = v + else: + d[k] = d[k] | v -class InstantiationMetadata: +class ValidationMetadata(frozendict): """ - A class to store metadata that is needed when instantiating OpenApi Schema subclasses + A class storing metadata that is needed to validate OpenApi Schema payloads """ - def __init__( - self, + def __new__( + cls, path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']), from_server: bool = False, configuration: typing.Optional[Configuration] = None, base_classes: typing.FrozenSet[typing.Type] = frozenset(), - path_to_schemas: typing.Optional[typing.Dict[str, typing.Set[typing.Type]]] = None, ): """ Args: @@ -91,23 +92,30 @@ class InstantiationMetadata: - one can disable validation checking base_classes: when deserializing data that matches multiple schemas, this is used to store the schemas that have been traversed. This is used to stop processing when a cycle is seen. - path_to_schemas: a dict that goes from path to a list of classes at each path location """ - self.path_to_item = path_to_item - self.from_server = from_server - self.configuration = configuration - self.base_classes = base_classes - if path_to_schemas is None: - path_to_schemas = defaultdict(set) - self.path_to_schemas = path_to_schemas + return super().__new__( + cls, + path_to_item=path_to_item, + from_server=from_server, + configuration=configuration, + base_classes=base_classes, + ) - def __repr__(self): - return str(self.__dict__) + @property + def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]: + return self.get('path_to_item') - def __eq__(self, other): - if not isinstance(other, InstantiationMetadata): - return False - return self.__dict__ == other.__dict__ + @property + def from_server(self) -> bool: + return self.get('from_server') + + @property + def configuration(self) -> typing.Optional[Configuration]: + return self.get('configuration') + + @property + def base_classes(self) -> typing.FrozenSet[typing.Type]: + return self.get('base_classes') class ValidatorBase: @@ -141,30 +149,30 @@ class ValidatorBase: @classmethod def __check_str_validations(cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxLength', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxLength', validation_metadata.configuration) and 'max_length' in validations and len(input_values) > validations['max_length']): cls.__raise_validation_error_message( value=input_values, constraint_msg="length must be less than or equal to", constraint_value=validations['max_length'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minLength', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minLength', validation_metadata.configuration) and 'min_length' in validations and len(input_values) < validations['min_length']): cls.__raise_validation_error_message( value=input_values, constraint_msg="length must be greater than or equal to", constraint_value=validations['min_length'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) checked_value = input_values - if (cls.__is_json_validation_enabled('pattern', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('pattern', validation_metadata.configuration) and 'regex' in validations): for regex_dict in validations['regex']: flags = regex_dict.get('flags', 0) @@ -176,42 +184,42 @@ class ValidatorBase: value=input_values, constraint_msg="must match regular expression", constraint_value=regex_dict['pattern'], - path_to_item=_instantiation_metadata.path_to_item, + path_to_item=validation_metadata.path_to_item, additional_txt=" with flags=`{}`".format(flags) ) cls.__raise_validation_error_message( value=input_values, constraint_msg="must match regular expression", constraint_value=regex_dict['pattern'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_tuple_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxItems', validation_metadata.configuration) and 'max_items' in validations and len(input_values) > validations['max_items']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of items must be less than or equal to", constraint_value=validations['max_items'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minItems', validation_metadata.configuration) and 'min_items' in validations and len(input_values) < validations['min_items']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of items must be greater than or equal to", constraint_value=validations['min_items'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('uniqueItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('uniqueItems', validation_metadata.configuration) and 'unique_items' in validations and validations['unique_items'] and input_values): unique_items = [] for item in input_values: @@ -222,41 +230,41 @@ class ValidatorBase: value=input_values, constraint_msg="duplicate items were found, and the tuple must not contain duplicates because", constraint_value='unique_items==True', - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_dict_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxProperties', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxProperties', validation_metadata.configuration) and 'max_properties' in validations and len(input_values) > validations['max_properties']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of properties must be less than or equal to", constraint_value=validations['max_properties'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minProperties', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minProperties', validation_metadata.configuration) and 'min_properties' in validations and len(input_values) < validations['min_properties']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of properties must be greater than or equal to", constraint_value=validations['min_properties'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_numeric_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): if cls.__is_json_validation_enabled('multipleOf', - _instantiation_metadata.configuration) and 'multiple_of' in validations: + validation_metadata.configuration) and 'multiple_of' in validations: multiple_of_values = validations['multiple_of'] for multiple_of_value in multiple_of_values: if (isinstance(input_values, decimal.Decimal) and @@ -267,7 +275,7 @@ class ValidatorBase: value=input_values, constraint_msg="value must be a multiple of", constraint_value=multiple_of_value, - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) checking_max_or_min_values = {'exclusive_maximum', 'inclusive_maximum', 'exclusive_minimum', @@ -277,44 +285,44 @@ class ValidatorBase: max_val = input_values min_val = input_values - if (cls.__is_json_validation_enabled('exclusiveMaximum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('exclusiveMaximum', validation_metadata.configuration) and 'exclusive_maximum' in validations and max_val >= validations['exclusive_maximum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value less than", constraint_value=validations['exclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('maximum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maximum', validation_metadata.configuration) and 'inclusive_maximum' in validations and max_val > validations['inclusive_maximum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value less than or equal to", constraint_value=validations['inclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('exclusiveMinimum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('exclusiveMinimum', validation_metadata.configuration) and 'exclusive_minimum' in validations and min_val <= validations['exclusive_minimum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value greater than", constraint_value=validations['exclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minimum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minimum', validation_metadata.configuration) and 'inclusive_minimum' in validations and min_val < validations['inclusive_minimum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value greater than or equal to", constraint_value=validations['inclusive_minimum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod @@ -322,18 +330,18 @@ class ValidatorBase: cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): if isinstance(input_values, str): - cls.__check_str_validations(validations, input_values, _instantiation_metadata) + cls.__check_str_validations(validations, input_values, validation_metadata) elif isinstance(input_values, tuple): - cls.__check_tuple_validations(validations, input_values, _instantiation_metadata) + cls.__check_tuple_validations(validations, input_values, validation_metadata) elif isinstance(input_values, frozendict): - cls.__check_dict_validations(validations, input_values, _instantiation_metadata) + cls.__check_dict_validations(validations, input_values, validation_metadata) elif isinstance(input_values, decimal.Decimal): - cls.__check_numeric_validations(validations, input_values, _instantiation_metadata) + cls.__check_numeric_validations(validations, input_values, validation_metadata) try: - return super()._validate_validations_pass(input_values, _instantiation_metadata) + return super()._validate_validations_pass(input_values, validation_metadata) except AttributeError: return True @@ -342,7 +350,7 @@ class Validator(typing.Protocol): def _validate_validations_pass( cls, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): pass @@ -353,11 +361,11 @@ def _SchemaValidator(**validations: typing.Union[str, bool, None, int, float, li def _validate_validations_pass( cls, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): - cls._check_validations_for_types(validations, input_values, _instantiation_metadata) + cls._check_validations_for_types(validations, input_values, validation_metadata) try: - return super()._validate_validations_pass(input_values, _instantiation_metadata) + return super()._validate_validations_pass(input_values, validation_metadata) except AttributeError: return True @@ -589,7 +597,7 @@ class DateBase(StrBase): return DEFAULT_ISOPARSER.parse_isodate(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: DEFAULT_ISOPARSER.parse_isodate(arg) @@ -597,16 +605,20 @@ class DateBase(StrBase): except ValueError: raise ApiValueError( "Value does not conform to the required ISO-8601 date format. " - "Invalid value '{}' for type date at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): """ DateBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class DateTimeBase: @@ -616,7 +628,7 @@ class DateTimeBase: return DEFAULT_ISOPARSER.parse_isodatetime(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: DEFAULT_ISOPARSER.parse_isodatetime(arg) @@ -624,16 +636,20 @@ class DateTimeBase: except ValueError: raise ApiValueError( "Value does not conform to the required ISO-8601 datetime format. " - "Invalid value '{}' for type datetime at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DateTimeBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class DecimalBase(StrBase): @@ -649,7 +665,7 @@ class DecimalBase(StrBase): return decimal.Decimal(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: decimal.Decimal(arg) @@ -657,16 +673,20 @@ class DecimalBase(StrBase): except decimal.InvalidOperation: raise ApiValueError( "Value cannot be converted to a decimal. " - "Invalid value '{}' for type decimal at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DecimalBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class NumberBase: @@ -703,7 +723,7 @@ class NumberBase: class ListBase: @classmethod - def _validate_items(cls, list_items, _instantiation_metadata: InstantiationMetadata): + def _validate_items(cls, list_items, validation_metadata: ValidationMetadata): """ Ensures that: - values passed in for items are valid @@ -720,22 +740,26 @@ class ListBase: # if we have definitions for an items schema, use it # otherwise accept anything item_cls = getattr(cls, '_items', AnyTypeSchema) - path_to_schemas = defaultdict(set) + path_to_schemas = {} for i, value in enumerate(list_items): if isinstance(value, item_cls): continue - item_instantiation_metadata = InstantiationMetadata( - from_server=_instantiation_metadata.from_server, - configuration=_instantiation_metadata.configuration, - path_to_item=_instantiation_metadata.path_to_item+(i,) + item_validation_metadata = ValidationMetadata( + from_server=validation_metadata.from_server, + configuration=validation_metadata.configuration, + path_to_item=validation_metadata.path_to_item+(i,) ) other_path_to_schemas = item_cls._validate( - value, _instantiation_metadata=item_instantiation_metadata) + value, validation_metadata=item_validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ ListBase _validate We return dynamic classes of different bases depending upon the inputs @@ -751,34 +775,41 @@ class ListBase: ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - arg = args[0] - _path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) if not isinstance(arg, tuple): return _path_to_schemas - if cls in _instantiation_metadata.base_classes: + if cls in validation_metadata.base_classes: # we have already moved through this class so stop here return _path_to_schemas - _instantiation_metadata.base_classes |= frozenset({cls}) - other_path_to_schemas = cls._validate_items(arg, _instantiation_metadata=_instantiation_metadata) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) + other_path_to_schemas = cls._validate_items(arg, validation_metadata=updated_vm) update(_path_to_schemas, other_path_to_schemas) return _path_to_schemas @classmethod - def _get_items(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _get_items( + cls: 'Schema', + arg: typing.List[typing.Any], + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): ''' ListBase _get_items ''' - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - - list_items = args[0] + list_items = arg cast_items = [] # if we have definitions for an items schema, use it # otherwise accept anything cls_item_cls = getattr(cls, '_items', AnyTypeSchema) for i, value in enumerate(list_items): - item_path_to_item = _instantiation_metadata.path_to_item+(i,) - item_cls = _instantiation_metadata.path_to_schemas.get(item_path_to_item) + item_path_to_item = path_to_item + (i,) + item_cls = path_to_schemas.get(item_path_to_item) if item_cls is None: item_cls = cls_item_cls @@ -786,14 +817,11 @@ class ListBase: cast_items.append(value) continue - item_instantiation_metadata = InstantiationMetadata( - configuration=_instantiation_metadata.configuration, - from_server=_instantiation_metadata.from_server, - path_to_item=item_path_to_item, - path_to_schemas=_instantiation_metadata.path_to_schemas, - ) new_value = item_cls._get_new_instance_without_conversion( - value, _instantiation_metadata=item_instantiation_metadata) + value, + item_path_to_item, + path_to_schemas + ) cast_items.append(new_value) return cast_items @@ -801,12 +829,12 @@ class ListBase: class Discriminable: @classmethod - def _ensure_discriminator_value_present(cls, disc_property_name: str, _instantiation_metadata: InstantiationMetadata, *args): + def _ensure_discriminator_value_present(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args): if not args or args and disc_property_name not in args[0]: # The input data does not contain the discriminator property raise ApiValueError( "Cannot deserialize input data due to missing discriminator. " - "The discriminator property '{}' is missing at path: {}".format(disc_property_name, _instantiation_metadata.path_to_item) + "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item) ) @classmethod @@ -900,7 +928,7 @@ class DictBase(Discriminable): ) @classmethod - def _validate_args(cls, arg, _instantiation_metadata: InstantiationMetadata): + def _validate_args(cls, arg, validation_metadata: ValidationMetadata): """ Ensures that: - values passed in for properties are valid @@ -913,7 +941,7 @@ class DictBase(Discriminable): Raises: ApiTypeError - for missing required arguments, or for invalid properties """ - path_to_schemas = defaultdict(set) + path_to_schemas = {} for property_name, value in arg.items(): if property_name in cls._required_property_names or property_name in cls._property_names: schema = getattr(cls, property_name) @@ -921,21 +949,25 @@ class DictBase(Discriminable): schema = cls._additional_properties else: raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format( - value, cls, _instantiation_metadata.path_to_item+(property_name,) + value, cls, validation_metadata.path_to_item+(property_name,) )) if isinstance(value, schema): continue - arg_instantiation_metadata = InstantiationMetadata( - from_server=_instantiation_metadata.from_server, - configuration=_instantiation_metadata.configuration, - path_to_item=_instantiation_metadata.path_to_item+(property_name,) + arg_validation_metadata = ValidationMetadata( + from_server=validation_metadata.from_server, + configuration=validation_metadata.configuration, + path_to_item=validation_metadata.path_to_item+(property_name,) ) - other_path_to_schemas = schema._validate(value, _instantiation_metadata=arg_instantiation_metadata) + other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DictBase _validate We return dynamic classes of different bases depending upon the inputs @@ -951,15 +983,14 @@ class DictBase(Discriminable): ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - if args and isinstance(args[0], cls): + if isinstance(arg, cls): # an instance of the correct type was passed in return {} - arg = args[0] - _path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) if not isinstance(arg, frozendict): return _path_to_schemas - cls._validate_arg_presence(args[0]) - other_path_to_schemas = cls._validate_args(args[0], _instantiation_metadata=_instantiation_metadata) + cls._validate_arg_presence(arg) + other_path_to_schemas = cls._validate_args(arg, validation_metadata=validation_metadata) update(_path_to_schemas, other_path_to_schemas) try: _discriminator = cls._discriminator @@ -967,7 +998,7 @@ class DictBase(Discriminable): return _path_to_schemas # discriminator exists disc_prop_name = list(_discriminator.keys())[0] - cls._ensure_discriminator_value_present(disc_prop_name, _instantiation_metadata, *args) + cls._ensure_discriminator_value_present(disc_prop_name, validation_metadata, arg) discriminated_cls = cls._get_discriminated_class( disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name]) if discriminated_cls is None: @@ -976,14 +1007,19 @@ class DictBase(Discriminable): cls.__name__, disc_prop_name, list(_discriminator[disc_prop_name].keys()), - _instantiation_metadata.path_to_item + (disc_prop_name,) + validation_metadata.path_to_item + (disc_prop_name,) ) ) - if discriminated_cls in _instantiation_metadata.base_classes: + if discriminated_cls in validation_metadata.base_classes: # we have already moved through this class so stop here return _path_to_schemas - _instantiation_metadata.base_classes |= frozenset({cls}) - other_path_to_schemas = discriminated_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) + other_path_to_schemas = discriminated_cls._validate(arg, validation_metadata=updated_vm) update(_path_to_schemas, other_path_to_schemas) return _path_to_schemas @@ -1016,7 +1052,12 @@ class DictBase(Discriminable): return tuple(property_names) @classmethod - def _get_properties(cls, arg: typing.Dict[str, typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _get_properties( + cls, + arg: typing.Dict[str, typing.Any], + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): """ DictBase _get_properties, this is how properties are set These values already passed validation @@ -1025,12 +1066,10 @@ class DictBase(Discriminable): # if we have definitions for property schemas convert values using it # otherwise accept anything - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - for property_name_js, value in arg.items(): property_cls = getattr(cls, property_name_js, cls._additional_properties) - property_path_to_item = _instantiation_metadata.path_to_item+(property_name_js,) - stored_property_cls = _instantiation_metadata.path_to_schemas.get(property_path_to_item) + property_path_to_item = path_to_item + (property_name_js,) + stored_property_cls = path_to_schemas.get(property_path_to_item) if stored_property_cls: property_cls = stored_property_cls @@ -1038,14 +1077,11 @@ class DictBase(Discriminable): dict_items[property_name_js] = value continue - prop_instantiation_metadata = InstantiationMetadata( - configuration=_instantiation_metadata.configuration, - from_server=_instantiation_metadata.from_server, - path_to_item=property_path_to_item, - path_to_schemas=_instantiation_metadata.path_to_schemas, - ) new_value = property_cls._get_new_instance_without_conversion( - value, _instantiation_metadata=prop_instantiation_metadata) + value, + property_path_to_item, + path_to_schemas + ) dict_items[property_name_js] = new_value return dict_items @@ -1189,7 +1225,11 @@ class Schema: return new_cls @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ Schema _validate Runs all schema validation logic and @@ -1217,21 +1257,21 @@ class Schema: ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - arg = args[0] - base_class = cls.__get_simple_class(arg) failed_type_check_classes = cls._validate_type(base_class) if failed_type_check_classes: raise cls.__get_type_error( arg, - _instantiation_metadata.path_to_item, + validation_metadata.path_to_item, failed_type_check_classes, key_type=False, ) if hasattr(cls, '_validate_validations_pass'): - cls._validate_validations_pass(arg, _instantiation_metadata) - path_to_schemas = defaultdict(set) - path_to_schemas[_instantiation_metadata.path_to_item].add(cls) + cls._validate_validations_pass(arg, validation_metadata) + path_to_schemas = {} + if validation_metadata.path_to_item not in path_to_schemas: + path_to_schemas[validation_metadata.path_to_item] = set() + path_to_schemas[validation_metadata.path_to_item].add(cls) if hasattr(cls, "_enum_by_value"): cls._validate_enum_value(arg) @@ -1240,7 +1280,7 @@ class Schema: if base_class is none_type or base_class is bool: return path_to_schemas - path_to_schemas[_instantiation_metadata.path_to_item].add(base_class) + path_to_schemas[validation_metadata.path_to_item].add(base_class) return path_to_schemas @classmethod @@ -1251,20 +1291,18 @@ class Schema: raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name)) @classmethod - def __get_new_cls(cls, arg, _instantiation_metadata: InstantiationMetadata): + def __get_new_cls( + cls, + arg, + validation_metadata: ValidationMetadata + ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], 'Schema']: """ - PATH 1 - make a new dynamic class and return an instance of that class + Make a new dynamic class and return an instance of that class We are making an instance of cls, but instead of making cls make a new class, new_cls which includes dynamic bases including cls return an instance of that new class - """ - if ( - _instantiation_metadata.path_to_schemas and - _instantiation_metadata.path_to_item in _instantiation_metadata.path_to_schemas): - chosen_new_cls = _instantiation_metadata.path_to_schemas[_instantiation_metadata.path_to_item] - return chosen_new_cls - """ + Dict property + List Item Assignment Use cases: 1. value is NOT an instance of the required schema class the value is validated by _validate @@ -1277,8 +1315,10 @@ class Schema: and in list/dict _get_items,_get_properties the value will be directly assigned because value is of the correct type, and validation was run earlier when the instance was created """ - _path_to_schemas = cls._validate(arg, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata) # loop through it make a new class for each entry + # do not modify the returned result because it is cached and we would be modifying the cached value + path_to_schemas = {} for path, schema_classes in _path_to_schemas.items(): enum_schema = any( hasattr(this_cls, '_enum_by_value') for this_cls in schema_classes) @@ -1304,7 +1344,7 @@ class Schema: mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes) if inheritable_primitive_type and not enum_schema: - _instantiation_metadata.path_to_schemas[path] = mfg_cls + path_to_schemas[path] = mfg_cls continue # Use case: value is None, True, False, or an enum value @@ -1319,18 +1359,23 @@ class Schema: mfg_cls = mfg_cls._class_by_base_class(none_type) else: raise ApiValueError('Unhandled case value={} bases={}'.format(value, mfg_cls.__bases__)) - _instantiation_metadata.path_to_schemas[path] = mfg_cls + path_to_schemas[path] = mfg_cls - return _instantiation_metadata.path_to_schemas[_instantiation_metadata.path_to_item] + return path_to_schemas @classmethod - def _get_new_instance_without_conversion(cls, arg, _instantiation_metadata): - # PATH 2 - we have a Dynamic class and we are making an instance of it + def _get_new_instance_without_conversion( + cls: 'Schema', + arg: typing.Any, + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): + # We have a Dynamic class and we are making an instance of it if issubclass(cls, frozendict): - properties = cls._get_properties(arg, _instantiation_metadata=_instantiation_metadata) + properties = cls._get_properties(arg, path_to_item, path_to_schemas) return super(Schema, cls).__new__(cls, properties) elif issubclass(cls, tuple): - items = cls._get_items(arg, _instantiation_metadata=_instantiation_metadata) + items = cls._get_items(arg, path_to_item, path_to_schemas) return super(Schema, cls).__new__(cls, items) """ str = openapi str, date, and datetime @@ -1361,16 +1406,20 @@ class Schema: io.BufferedReader, bytes ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] + _configuration: typing.Optional[Configuration] ): + """ + Schema _from_openapi_data + """ arg = cast_to_allowed_types(arg, from_server=True) - _instantiation_metadata = InstantiationMetadata(from_server=True) if _instantiation_metadata is None else _instantiation_metadata - if not _instantiation_metadata.from_server: - raise ApiValueError( - 'from_server must be True in this code path, if you need it to be False, use cls()' - ) - new_cls = cls.__get_new_cls(arg, _instantiation_metadata) - new_inst = new_cls._get_new_instance_without_conversion(arg, _instantiation_metadata) + validation_metadata = ValidationMetadata(from_server=True, configuration=_configuration) + path_to_schemas = cls.__get_new_cls(arg, validation_metadata) + new_cls = path_to_schemas[validation_metadata.path_to_item] + new_inst = new_cls._get_new_instance_without_conversion( + arg, + validation_metadata.path_to_item, + path_to_schemas + ) return new_inst @staticmethod @@ -1386,14 +1435,15 @@ class Schema: def __remove_unsets(kwargs): return {key: val for key, val in kwargs.items() if val is not unset} - def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]): + def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]): """ Schema __new__ Args: args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): the value kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): dict values - _instantiation_metadata: contains the needed from_server, configuration, path_to_item + _configuration: contains the Configuration that enables json schema validation keywords + like minItems, minLength etc """ kwargs = cls.__remove_unsets(kwargs) if not args and not kwargs: @@ -1404,20 +1454,21 @@ class Schema: arg = args[0] else: arg = cls.__get_input_dict(*args, **kwargs) - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - if _instantiation_metadata.from_server: - raise ApiValueError( - 'from_server must be False in this code path, if you need it to be True, use cls._from_openapi_data()' - ) - arg = cast_to_allowed_types(arg, from_server=_instantiation_metadata.from_server) - new_cls = cls.__get_new_cls(arg, _instantiation_metadata) - return new_cls._get_new_instance_without_conversion(arg, _instantiation_metadata) + validation_metadata = ValidationMetadata(configuration=_configuration, from_server=False) + arg = cast_to_allowed_types(arg, from_server=validation_metadata.from_server) + path_to_schemas = cls.__get_new_cls(arg, validation_metadata) + new_cls = path_to_schemas[validation_metadata.path_to_item] + return new_cls._get_new_instance_without_conversion( + arg, + validation_metadata.path_to_item, + path_to_schemas + ) def __init__( self, *args: typing.Union[ dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[ dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset ] @@ -1447,6 +1498,8 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal because isinstance(True, int) is True """ return arg + elif isinstance(arg, int): + return decimal.Decimal(arg) elif isinstance(arg, float): decimal_from_float = decimal.Decimal(arg) if decimal_from_float.as_integer_ratio()[1] == 1: @@ -1456,8 +1509,6 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal return decimal_from_float elif type(arg) is list or type(arg) is tuple: return tuple([cast_to_allowed_types(item) for item in arg]) - elif isinstance(arg, int): - return decimal.Decimal(arg) elif arg is None: return arg elif isinstance(arg, (date, datetime)): @@ -1469,6 +1520,8 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal return arg elif isinstance(arg, bytes): return arg + elif isinstance(arg, decimal.Decimal): + return arg elif isinstance(arg, (io.FileIO, io.BufferedReader)): if arg.closed: raise ApiValueError('Invalid file state; file is closed and must be open') @@ -1481,12 +1534,12 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal class ComposedBase(Discriminable): @classmethod - def __get_allof_classes(cls, *args, _instantiation_metadata: InstantiationMetadata): + def __get_allof_classes(cls, *args, validation_metadata: ValidationMetadata): path_to_schemas = defaultdict(set) for allof_cls in cls._composed_schemas['allOf']: - if allof_cls in _instantiation_metadata.base_classes: + if allof_cls in validation_metadata.base_classes: continue - other_path_to_schemas = allof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = allof_cls._validate(*args, validation_metadata=validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @@ -1495,16 +1548,16 @@ class ComposedBase(Discriminable): cls, *args, discriminated_cls, - _instantiation_metadata: InstantiationMetadata, + validation_metadata: ValidationMetadata, path_to_schemas: typing.Dict[typing.Tuple, typing.Set[typing.Type[Schema]]] ): oneof_classes = [] chosen_oneof_cls = None - original_base_classes = _instantiation_metadata.base_classes - new_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes + new_base_classes = validation_metadata.base_classes path_to_schemas = defaultdict(set) for oneof_cls in cls._composed_schemas['oneOf']: - if oneof_cls in path_to_schemas[_instantiation_metadata.path_to_item]: + if oneof_cls in path_to_schemas[validation_metadata.path_to_item]: oneof_classes.append(oneof_cls) continue if isinstance(args[0], oneof_cls): @@ -1512,10 +1565,9 @@ class ComposedBase(Discriminable): chosen_oneof_cls = oneof_cls oneof_classes.append(oneof_cls) continue - _instantiation_metadata.base_classes = original_base_classes try: - path_to_schemas = oneof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) - new_base_classes = _instantiation_metadata.base_classes + path_to_schemas = oneof_cls._validate(*args, validation_metadata=validation_metadata) + new_base_classes = validation_metadata.base_classes except (ApiValueError, ApiTypeError) as ex: if discriminated_cls is not None and oneof_cls is discriminated_cls: raise ex @@ -1532,7 +1584,6 @@ class ComposedBase(Discriminable): "Invalid inputs given to generate an instance of {}. Multiple " "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes) ) - _instantiation_metadata.base_classes = new_base_classes return path_to_schemas @classmethod @@ -1540,14 +1591,14 @@ class ComposedBase(Discriminable): cls, *args, discriminated_cls, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): anyof_classes = [] chosen_anyof_cls = None - original_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes path_to_schemas = defaultdict(set) for anyof_cls in cls._composed_schemas['anyOf']: - if anyof_cls in _instantiation_metadata.base_classes: + if anyof_cls in validation_metadata.base_classes: continue if isinstance(args[0], anyof_cls): # passed in instance is the correct type @@ -1555,14 +1606,13 @@ class ComposedBase(Discriminable): anyof_classes.append(anyof_cls) continue - _instantiation_metadata.base_classes = original_base_classes try: - other_path_to_schemas = anyof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = anyof_cls._validate(*args, validation_metadata=validation_metadata) except (ApiValueError, ApiTypeError) as ex: if discriminated_cls is not None and anyof_cls is discriminated_cls: raise ex continue - original_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes chosen_anyof_cls = anyof_cls anyof_classes.append(anyof_cls) update(path_to_schemas, other_path_to_schemas) @@ -1574,7 +1624,11 @@ class ComposedBase(Discriminable): return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ ComposedBase _validate We return dynamic classes of different bases depending upon the inputs @@ -1590,65 +1644,70 @@ class ComposedBase(Discriminable): ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - if args and isinstance(args[0], Schema) and _instantiation_metadata.from_server is False: - if isinstance(args[0], cls): + if isinstance(arg, Schema) and validation_metadata.from_server is False: + if isinstance(arg, cls): # an instance of the correct type was passed in return {} raise ApiTypeError( 'Incorrect type passed in, required type was {} and passed type was {} at {}'.format( cls, - type(args[0]), - _instantiation_metadata.path_to_item + type(arg), + validation_metadata.path_to_item ) ) # validation checking on types, validations, and enums - path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) - _instantiation_metadata.base_classes |= frozenset({cls}) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) # process composed schema _discriminator = getattr(cls, '_discriminator', None) discriminated_cls = None - if _discriminator and args and isinstance(args[0], frozendict): + if _discriminator and arg and isinstance(arg, frozendict): disc_property_name = list(_discriminator.keys())[0] - cls._ensure_discriminator_value_present(disc_property_name, _instantiation_metadata, *args) + cls._ensure_discriminator_value_present(disc_property_name, updated_vm, arg) # get discriminated_cls by looking at the dict in the current class discriminated_cls = cls._get_discriminated_class( - disc_property_name=disc_property_name, disc_payload_value=args[0][disc_property_name]) + disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name]) if discriminated_cls is None: raise ApiValueError( "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format( - args[0][disc_property_name], + arg[disc_property_name], cls.__name__, disc_property_name, list(_discriminator[disc_property_name].keys()), - _instantiation_metadata.path_to_item + (disc_property_name,) + updated_vm.path_to_item + (disc_property_name,) ) ) if cls._composed_schemas['allOf']: - other_path_to_schemas = cls.__get_allof_classes(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm) update(path_to_schemas, other_path_to_schemas) if cls._composed_schemas['oneOf']: other_path_to_schemas = cls.__get_oneof_class( - *args, + arg, discriminated_cls=discriminated_cls, - _instantiation_metadata=_instantiation_metadata, + validation_metadata=updated_vm, path_to_schemas=path_to_schemas ) update(path_to_schemas, other_path_to_schemas) if cls._composed_schemas['anyOf']: other_path_to_schemas = cls.__get_anyof_classes( - *args, + arg, discriminated_cls=discriminated_cls, - _instantiation_metadata=_instantiation_metadata + validation_metadata=updated_vm ) update(path_to_schemas, other_path_to_schemas) if discriminated_cls is not None: # TODO use an exception from this package here - assert discriminated_cls in path_to_schemas[_instantiation_metadata.path_to_item] + assert discriminated_cls in path_to_schemas[updated_vm.path_to_item] return path_to_schemas @@ -1669,12 +1728,12 @@ class ComposedSchema( _composed_schemas = {} @classmethod - def _from_openapi_data(cls, *args: typing.Any, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs): + def _from_openapi_data(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs): if not args: if not kwargs: raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__)) args = (kwargs, ) - return super()._from_openapi_data(args[0], _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(args[0], _configuration=_configuration) class ListSchema( @@ -1684,10 +1743,10 @@ class ListSchema( ): @classmethod - def _from_openapi_data(cls, arg: typing.List[typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[list, tuple], **kwargs: InstantiationMetadata): + def __new__(cls, arg: typing.Union[list, tuple], **kwargs: ValidationMetadata): return super().__new__(cls, arg, **kwargs) @@ -1698,10 +1757,10 @@ class NoneSchema( ): @classmethod - def _from_openapi_data(cls, arg: None, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: None, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: None, **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: None, **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1716,10 +1775,10 @@ class NumberSchema( """ @classmethod - def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1733,31 +1792,35 @@ class IntBase(NumberBase): return self._as_int @classmethod - def _validate_format(cls, arg: typing.Optional[decimal.Decimal], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata): if isinstance(arg, decimal.Decimal): exponent = arg.as_tuple().exponent if exponent != 0: raise ApiValueError( - "Invalid value '{}' for type integer at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ IntBase _validate TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class IntSchema(IntBase, NumberSchema): @classmethod - def _from_openapi_data(cls, arg: int, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: int, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1808,9 +1871,9 @@ class Float32Schema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): # todo check format - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(arg, _configuration=_configuration) class Float64Base( @@ -1828,9 +1891,9 @@ class Float64Schema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): # todo check format - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(arg, _configuration=_configuration) class StrSchema( @@ -1846,28 +1909,28 @@ class StrSchema( """ @classmethod - def _from_openapi_data(cls, arg: typing.Union[str], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None) -> 'StrSchema': - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema': + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[str, date, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, date, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DateSchema(DateBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DateTimeSchema(DateTimeBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DecimalSchema(DecimalBase, StrSchema): - def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[ValidationMetadata]): """ Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads which can be simple (str) or complex (dicts or lists with nested values) @@ -1886,7 +1949,7 @@ class BytesSchema( """ this class will subclass bytes and is immutable """ - def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[ValidationMetadata]): return super(Schema, cls).__new__(cls, arg) @@ -1911,7 +1974,7 @@ class FileSchema( - to be able to preserve file name info """ - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[ValidationMetadata]): return super(Schema, cls).__new__(cls, arg) @@ -1946,7 +2009,7 @@ class BinarySchema( ], } - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg) @@ -1957,10 +2020,10 @@ class BoolSchema( ): @classmethod - def _from_openapi_data(cls, arg: bool, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: bool, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: bool, **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: bool, **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1986,10 +2049,10 @@ class DictSchema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Dict[str, typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, InstantiationMetadata]): + def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]): return super().__new__(cls, *args, **kwargs) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api_endpoints/call_123_test_special_tags.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api_endpoints/call_123_test_special_tags.py index d8e8700aed00..e76f66f18b84 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api_endpoints/call_123_test_special_tags.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api_endpoints/call_123_test_special_tags.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py index 2e7164b4db24..d47ac5388904 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/additional_properties_with_array_of_enums.py index a980fc167748..2558ab4abfed 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/additional_properties_with_array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/additional_properties_with_array_of_enums.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_model.py index c864cb57521e..49b12b8e23eb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_model.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_model.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_of_enums.py index 581a2cf36b04..3e23d008fbcb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_of_enums.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_file_schema.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_file_schema.py index 14eb9ddd3553..dcbde8810f60 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_file_schema.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_file_schema.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_query_params.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_query_params.py index 30ed8b1c8ff3..298b9d752c15 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_query_params.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_query_params.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/boolean.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/boolean.py index 3611abb2da57..8b46d4c9e33b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/boolean.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/boolean.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/case_sensitive_params.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/case_sensitive_params.py index 8a8e707648d2..ab3b1178fce9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/case_sensitive_params.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/case_sensitive_params.py @@ -36,7 +36,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/client_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/client_model.py index be63bf5e8a4f..e6f5b673c0b3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/client_model.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/client_model.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/composed_one_of_different_types.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/composed_one_of_different_types.py index cd997455196d..1965180d96c7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/composed_one_of_different_types.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/composed_one_of_different_types.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py index 639c85ec7819..91c0e8af5fba 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -175,7 +175,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( dateTime: typing.Union[dateTime, Unset] = unset, password: typing.Union[password, Unset] = unset, callback: typing.Union[callback, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': return super().__new__( @@ -190,7 +190,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( dateTime=dateTime, password=password, callback=callback, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py index a3ac05fa5f07..1d62e955d524 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -351,7 +351,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( *args: typing.Union[dict, frozendict, ], enum_form_string_array: typing.Union[enum_form_string_array, Unset] = unset, enum_form_string: typing.Union[enum_form_string, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': return super().__new__( @@ -359,7 +359,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( *args, enum_form_string_array=enum_form_string_array, enum_form_string=enum_form_string, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/fake_health_get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/fake_health_get.py index e3970df11dde..fbe36a965b29 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/fake_health_get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/fake_health_get.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/group_parameters.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/group_parameters.py index bab146a1f469..bcbcbeaf356a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/group_parameters.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/group_parameters.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_additional_properties.py index 47fb548b1f25..945d58b8e424 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_additional_properties.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_additional_properties.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -73,13 +73,13 @@ class SchemaForRequestBodyApplicationJson( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationJson': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py index 1253597ad0a1..ebb5a6c44c3e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -102,13 +102,13 @@ class CompositionAtRootSchema( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'CompositionAtRootSchema': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -154,13 +154,13 @@ class CompositionInPropertySchema( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'someProp': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -169,14 +169,14 @@ class CompositionInPropertySchema( cls, *args: typing.Union[dict, frozendict, ], someProp: typing.Union[someProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'CompositionInPropertySchema': return super().__new__( cls, *args, someProp=someProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) RequestRequiredQueryParams = typing.TypedDict( @@ -249,13 +249,13 @@ class SchemaForRequestBodyApplicationJson( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationJson': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -301,13 +301,13 @@ class SchemaForRequestBodyMultipartFormData( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'someProp': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -316,14 +316,14 @@ class SchemaForRequestBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], someProp: typing.Union[someProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyMultipartFormData': return super().__new__( cls, *args, someProp=someProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -376,13 +376,13 @@ class SchemaFor200ResponseBodyApplicationJson( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaFor200ResponseBodyApplicationJson': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -428,13 +428,13 @@ class SchemaFor200ResponseBodyMultipartFormData( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'someProp': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -443,14 +443,14 @@ class SchemaFor200ResponseBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], someProp: typing.Union[someProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaFor200ResponseBodyMultipartFormData': return super().__new__( cls, *args, someProp=someProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py index aac637d1507f..8220d47168f2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -76,13 +76,13 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/mammal.py index 8ac173426e32..52ea9c264ab7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/mammal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/mammal.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/number_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/number_with_validations.py index 1826a74b2718..4c4ba65c9abb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/number_with_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/number_with_validations.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_model_with_ref_props.py index 77f4b3ad9756..2fc439164a07 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_model_with_ref_props.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_model_with_ref_props.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/parameter_collisions.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/parameter_collisions.py index e1606beb30e3..bd20c173d4cb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/parameter_collisions.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/parameter_collisions.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py index 4fef58c1548f..683f9d3c3502 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py @@ -36,7 +36,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string.py index 318ab585f742..eb3a762d05dd 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string_enum.py index 7dc15a2977b8..fdc7c63c29ad 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string_enum.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string_enum.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_download_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_download_file.py index 77527a9eff31..637473cacce6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_download_file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_download_file.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py index 3dce641e4769..54db5968afdf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -79,14 +79,14 @@ class SchemaForRequestBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyMultipartFormData': return super().__new__( cls, *args, additionalMetadata=additionalMetadata, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py index 2eed478036df..87eac93b2d6a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -81,14 +81,14 @@ class SchemaForRequestBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], files: typing.Union[files, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyMultipartFormData': return super().__new__( cls, *args, files=files, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags123_api_endpoints/classname.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags123_api_endpoints/classname.py index d4839bb9b699..99b59bc4d6bb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags123_api_endpoints/classname.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags123_api_endpoints/classname.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api_endpoints/classname.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api_endpoints/classname.py index d4839bb9b699..99b59bc4d6bb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api_endpoints/classname.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api_endpoints/classname.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/add_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/add_pet.py index bc2b459c4c19..07edc4a35e83 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/add_pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/add_pet.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/delete_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/delete_pet.py index 8f75bcbd8aa5..04f2de63359d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/delete_pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/delete_pet.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_status.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_status.py index c75db96db9bf..a0c199caefd0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_status.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_status.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_tags.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_tags.py index 028f8d68d795..a2fdb8cb0d2f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_tags.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_tags.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/get_pet_by_id.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/get_pet_by_id.py index ca6e4ae9f750..2ab39b7fcebe 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/get_pet_by_id.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/get_pet_by_id.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet.py index 3c3578420ca6..3510aed29b3c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py index 2961059c15b5..e1241732b393 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -102,7 +102,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( *args: typing.Union[dict, frozendict, ], name: typing.Union[name, Unset] = unset, status: typing.Union[status, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': return super().__new__( @@ -110,7 +110,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( *args, name=name, status=status, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file.py deleted file mode 100644 index faa353d8d30e..000000000000 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file.py +++ /dev/null @@ -1,216 +0,0 @@ -# coding: utf-8 - -""" - - - Generated by: https://openapi-generator.tech -""" - -from dataclasses import dataclass -import re # noqa: F401 -import sys # noqa: F401 -import typing -import urllib3 -from urllib3._collections import HTTPHeaderDict - -from petstore_api import api_client, exceptions -from decimal import Decimal # noqa: F401 -from datetime import date, datetime # noqa: F401 -from frozendict import frozendict # noqa: F401 - -from petstore_api.schemas import ( # noqa: F401 - AnyTypeSchema, - ComposedSchema, - DictSchema, - ListSchema, - StrSchema, - IntSchema, - Int32Schema, - Int64Schema, - Float32Schema, - Float64Schema, - NumberSchema, - DateSchema, - DateTimeSchema, - BoolSchema, - FileSchema, - NoneSchema, - none_type, - InstantiationMetadata, - Unset, - unset, - ComposedBase, - ListBase, - DictBase, - NoneBase, - StrBase, - IntBase, - NumberBase, - DateBase, - DateTimeBase, - BoolBase, - FileBase, - Schema, - _SchemaValidator, - _SchemaTypeChecker, - _SchemaEnumMaker -) - -from petstore_api.model.api_response import ApiResponse - -# path params -PetIdSchema = Int64Schema -RequestRequiredPathParams = typing.TypedDict( - 'RequestRequiredPathParams', - { - 'petId': PetIdSchema, - } -) -RequestOptionalPathParams = typing.TypedDict( - 'RequestOptionalPathParams', - { - }, - total=False -) - - -class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams): - pass - - -request_path_pet_id = api_client.PathParameter( - name="petId", - style=api_client.ParameterStyle.SIMPLE, - schema=PetIdSchema, - required=True, -) -# body param - - -class SchemaForRequestBodyMultipartFormData( - DictSchema -): - additionalMetadata = StrSchema - file = FileSchema - - - def __new__( - cls, - *args: typing.Union[dict, frozendict, ], - additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, - file: typing.Union[file, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, - **kwargs: typing.Type[Schema], - ): - return super().__new__( - cls, - *args, - additionalMetadata=additionalMetadata, - file=file, - _instantiation_metadata=_instantiation_metadata, - **kwargs, - ) - - -request_body_body = api_client.RequestBody( - content={ - 'multipart/form-data': api_client.MediaType( - schema=SchemaForRequestBodyMultipartFormData), - }, -) -_path = '/pet/{petId}/uploadImage' -_method = 'POST' -_auth = [ - 'petstore_auth', -] -SchemaFor200ResponseBodyApplicationJson = ApiResponse - - -@dataclass -class ApiResponseFor200(api_client.ApiResponse): - response: urllib3.HTTPResponse - body: typing.Union[ - SchemaFor200ResponseBodyApplicationJson, - ] - headers: Unset = unset - - -_response_for_200 = api_client.OpenApiResponse( - response_cls=ApiResponseFor200, - content={ - 'application/json': api_client.MediaType( - schema=SchemaFor200ResponseBodyApplicationJson), - }, -) -_status_code_to_response = { - '200': _response_for_200, -} -_all_accept_content_types = ( - 'application/json', -) - - -class UploadFile(api_client.Api): - - def upload_file( - self: api_client.Api, - body: typing.Union[SchemaForRequestBodyMultipartFormData, Unset] = unset, - path_params: RequestPathParams = frozendict(), - content_type: str = 'multipart/form-data', - accept_content_types: typing.Tuple[str] = _all_accept_content_types, - ) -> typing.Union[ - ApiResponseFor200, - api_client.ApiResponseWithoutDeserialization - ]: - """ - uploads an image - Parameters use leading underscores to prevent collisions with user defined - parameters from the source openapi spec - """ - self._verify_typed_dict_inputs(RequestPathParams, path_params) - - _path_params = {} - for parameter in ( - request_path_pet_id, - ): - parameter_data = path_params.get(parameter.name, unset) - if parameter_data is unset: - continue - serialized_data = parameter.serialize(parameter_data) - _path_params.update(serialized_data) - - _headers = HTTPHeaderDict() - # TODO add cookie handling - if accept_content_types: - for accept_content_type in accept_content_types: - _headers.add('Accept', accept_content_type) - - _fields = None - _body = None - if body is not unset: - serialized_data = request_body_body.serialize(body, content_type) - _headers.add('Content-Type', content_type) - if 'fields' in serialized_data: - _fields = serialized_data['fields'] - elif 'body' in serialized_data: - _body = serialized_data['body'] - response = self.api_client.call_api( - resource_path=_path, - method=_method, - path_params=_path_params, - headers=_headers, - fields=_fields, - body=_body, - auth_settings=_auth, - ) - - response_for_status = _status_code_to_response.get(str(response.status)) - if response_for_status: - api_response = response_for_status.deserialize(response, self.api_client.configuration) - else: - api_response = api_client.ApiResponseWithoutDeserialization(response=response) - - if not 200 <= response.status <= 299: - raise exceptions.ApiException(api_response=api_response) - - return api_response diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py index 62404922a6fc..f815449781a5 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -105,14 +105,14 @@ class SchemaForRequestBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyMultipartFormData': return super().__new__( cls, *args, additionalMetadata=additionalMetadata, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py index 53751178469a..3e4b5b4e44bf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -103,14 +103,14 @@ class SchemaForRequestBodyMultipartFormData( cls, *args: typing.Union[dict, frozendict, ], additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaForRequestBodyMultipartFormData': return super().__new__( cls, *args, additionalMetadata=additionalMetadata, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/delete_order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/delete_order.py index 2ed9303649cd..bd874c07e3ed 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/delete_order.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/delete_order.py @@ -36,7 +36,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_inventory.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_inventory.py index a674b60efe4e..61bfd7dc7d53 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_inventory.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_inventory.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -77,13 +77,13 @@ class SchemaFor200ResponseBodyApplicationJson( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SchemaFor200ResponseBodyApplicationJson': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_order_by_id.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_order_by_id.py index bf7861386a3d..b905d60bc29c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_order_by_id.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_order_by_id.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/place_order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/place_order.py index 881f91dc5c48..f54e82eec398 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/place_order.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/place_order.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_user.py index 7bf386a6936b..3c84f45e584c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_user.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_array_input.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_array_input.py index 22d7f23164a0..c55c22b4258f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_array_input.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_array_input.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_list_input.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_list_input.py index 558f9086b3cf..644e5c817757 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_list_input.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_list_input.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/delete_user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/delete_user.py index 88b859ff00ba..fba5cf8ddbe9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/delete_user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/delete_user.py @@ -36,7 +36,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/get_user_by_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/get_user_by_name.py index 9c5583d5c6d8..d5605304c1bc 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/get_user_by_name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/get_user_by_name.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/login_user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/login_user.py index 478b4869d829..da572bf71058 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/login_user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/login_user.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/logout_user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/logout_user.py index b9aa62e0c2a6..da285ca93740 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/logout_user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/logout_user.py @@ -36,7 +36,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/update_user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/update_user.py index 37fed9bcf273..e16227af6b3a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/update_user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/update_user.py @@ -37,7 +37,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py index 3aa0d288d589..c6918355c9cd 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py @@ -35,7 +35,6 @@ from petstore_api.schemas import ( Schema, FileIO, BinarySchema, - InstantiationMetadata, date, datetime, none_type, @@ -811,9 +810,8 @@ class OpenApiResponse: else: raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type)) body_schema = self.content[content_type].schema - _instantiation_metadata = InstantiationMetadata(from_server=True, configuration=configuration) deserialized_body = body_schema._from_openapi_data( - body_data, _instantiation_metadata=_instantiation_metadata) + body_data, _configuration=configuration) elif streamed: response.release_conn() diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py index 2c5686051176..6078bb2dbae1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -82,13 +82,13 @@ class AdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map_property': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -107,13 +107,13 @@ class AdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_additional_properties': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -121,13 +121,13 @@ class AdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map_of_map_property': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) anytype_1 = AnyTypeSchema @@ -145,12 +145,12 @@ class AdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'empty_map': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -163,13 +163,13 @@ class AdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map_with_undeclared_properties_string': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -185,7 +185,7 @@ class AdditionalPropertiesClass( map_with_undeclared_properties_anytype_3: typing.Union[map_with_undeclared_properties_anytype_3, Unset] = unset, empty_map: typing.Union[empty_map, Unset] = unset, map_with_undeclared_properties_string: typing.Union[map_with_undeclared_properties_string, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'AdditionalPropertiesClass': return super().__new__( @@ -199,6 +199,6 @@ class AdditionalPropertiesClass( map_with_undeclared_properties_anytype_3=map_with_undeclared_properties_anytype_3, empty_map=empty_map, map_with_undeclared_properties_string=map_with_undeclared_properties_string, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py index c94a35d111be..fee5e18bcd0b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -86,13 +86,13 @@ class AdditionalPropertiesWithArrayOfEnums( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'AdditionalPropertiesWithArrayOfEnums': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py index 4bcd72165671..ed6eb84f2b13 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -77,12 +77,12 @@ class Address( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Address': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py index 2e1a97f9ffa4..0a7ee8a9bbfd 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -93,7 +93,7 @@ class Animal( *args: typing.Union[dict, frozendict, ], className: className, color: typing.Union[color, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Animal': return super().__new__( @@ -101,7 +101,7 @@ class Animal( *args, className=className, color=color, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py index be131584f2c3..cc4fe75682ac 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py index 201a8188f58a..6f88e92b3a5b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -82,7 +82,7 @@ class ApiResponse( code: typing.Union[code, Unset] = unset, type: typing.Union[type, Unset] = unset, message: typing.Union[message, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ApiResponse': return super().__new__( @@ -91,6 +91,6 @@ class ApiResponse( code=code, type=type, message=message, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py index c85b60cf1ce3..14cc41447769 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -107,13 +107,13 @@ class Apple( cls, *args: typing.Union[dict, frozendict, None, ], origin: typing.Union[origin, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Apple': return super().__new__( cls, *args, origin=origin, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py index 5e423efafba6..7a783a792618 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -84,12 +84,12 @@ class AppleReq( *args: typing.Union[dict, frozendict, ], cultivar: cultivar, mealy: typing.Union[mealy, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'AppleReq': return super().__new__( cls, *args, cultivar=cultivar, mealy=mealy, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py index c2edbaeb0efa..bf544e435839 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py index b7e1221340d0..aab971e0126c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -88,13 +88,13 @@ class ArrayOfArrayOfNumberOnly( cls, *args: typing.Union[dict, frozendict, ], ArrayArrayNumber: typing.Union[ArrayArrayNumber, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ArrayOfArrayOfNumberOnly': return super().__new__( cls, *args, ArrayArrayNumber=ArrayArrayNumber, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py index e394fe933116..103a013aa955 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py index 7ff4a959c9cb..bbaa209e0b96 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -83,13 +83,13 @@ class ArrayOfNumberOnly( cls, *args: typing.Union[dict, frozendict, ], ArrayNumber: typing.Union[ArrayNumber, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ArrayOfNumberOnly': return super().__new__( cls, *args, ArrayNumber=ArrayNumber, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py index c94a91a879db..fd4f706c77ba 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -111,7 +111,7 @@ class ArrayTest( array_of_string: typing.Union[array_of_string, Unset] = unset, array_array_of_integer: typing.Union[array_array_of_integer, Unset] = unset, array_array_of_model: typing.Union[array_array_of_model, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ArrayTest': return super().__new__( @@ -120,7 +120,7 @@ class ArrayTest( array_of_string=array_of_string, array_array_of_integer=array_array_of_integer, array_array_of_model=array_array_of_model, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py index 79a9aad5fd75..8f55d11fb398 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py index fe60e91a7ba0..599a3f18133a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -81,13 +81,13 @@ class Banana( cls, *args: typing.Union[dict, frozendict, ], lengthCm: lengthCm, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Banana': return super().__new__( cls, *args, lengthCm=lengthCm, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py index bf3fac7cb945..d1d3f423ad20 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -84,12 +84,12 @@ class BananaReq( *args: typing.Union[dict, frozendict, ], lengthCm: lengthCm, sweet: typing.Union[sweet, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'BananaReq': return super().__new__( cls, *args, lengthCm=lengthCm, sweet=sweet, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py index 81ce5b09a51f..c7227c6d0884 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py index bfff57cb0824..916d0163ba02 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -95,13 +95,13 @@ class BasquePig( cls, *args: typing.Union[dict, frozendict, ], className: className, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'BasquePig': return super().__new__( cls, *args, className=className, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py index 263bdbdcdd76..4bfefa998fe8 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py index c40292d6ee23..32bb99030a46 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py index 1e9d2b12f8d4..2cc55f390797 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -88,7 +88,7 @@ class Capitalization( Capital_Snake: typing.Union[Capital_Snake, Unset] = unset, SCA_ETH_Flow_Points: typing.Union[SCA_ETH_Flow_Points, Unset] = unset, ATT_NAME: typing.Union[ATT_NAME, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Capitalization': return super().__new__( @@ -100,6 +100,6 @@ class Capitalization( Capital_Snake=Capital_Snake, SCA_ETH_Flow_Points=SCA_ETH_Flow_Points, ATT_NAME=ATT_NAME, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py index 5bcbd3abdad7..170ffbedc345 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class Cat( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Cat': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat_all_of.py index 549885a2e27c..e9c7e8ce60c6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class CatAllOf( cls, *args: typing.Union[dict, frozendict, ], declawed: typing.Union[declawed, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'CatAllOf': return super().__new__( cls, *args, declawed=declawed, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py index 94a7ff0a0c3c..55a23fb99a59 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -83,7 +83,7 @@ class Category( *args: typing.Union[dict, frozendict, ], name: name, id: typing.Union[id, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Category': return super().__new__( @@ -91,6 +91,6 @@ class Category( *args, name=name, id=id, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py index 3d5cc122bfa1..ba9b39bec117 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class ChildCat( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ChildCat': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat_all_of.py index c152c0f10605..728dfef2ef1b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class ChildCatAllOf( cls, *args: typing.Union[dict, frozendict, ], name: typing.Union[name, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ChildCatAllOf': return super().__new__( cls, *args, name=name, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py index 4f1e9ed14a54..e487ff57e72f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -79,13 +79,13 @@ class ClassModel( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], _class: typing.Union[_class, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ClassModel': return super().__new__( cls, *args, _class=_class, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py index a476e5d92c3b..ca8b37f7cfe0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class Client( cls, *args: typing.Union[dict, frozendict, ], client: typing.Union[client, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Client': return super().__new__( cls, *args, client=client, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py index 5c1c3815296a..eec32e53e9b3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class ComplexQuadrilateral( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ComplexQuadrilateral': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral_all_of.py index f91b041e09e1..de77940b972b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class ComplexQuadrilateralAllOf( cls, *args: typing.Union[dict, frozendict, ], quadrilateralType: typing.Union[quadrilateralType, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ComplexQuadrilateralAllOf': return super().__new__( cls, *args, quadrilateralType=quadrilateralType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py index bab2f27e022a..d8e8e670f03b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -131,12 +131,12 @@ class ComposedAnyOfDifferentTypesNoValidations( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ComposedAnyOfDifferentTypesNoValidations': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py index 4582184e4653..5fc3f82f5162 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py index 3ea21ab42be9..cd1f5be59c22 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,10 +97,10 @@ class ComposedBool( def __new__( cls, *args: typing.Union[bool, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'ComposedBool': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py index d6a1f7cced53..6915f1d636f1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,10 +97,10 @@ class ComposedNone( def __new__( cls, *args: typing.Union[None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'ComposedNone': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py index 928f58b5bd80..ae586d764f9e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,10 +97,10 @@ class ComposedNumber( def __new__( cls, *args: typing.Union[float, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'ComposedNumber': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py index fe8ec7865805..30b78e94cdc8 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,12 +97,12 @@ class ComposedObject( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ComposedObject': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py index 071e8b2febfe..f4e40d70397f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -100,13 +100,13 @@ class ComposedOneOfDifferentTypes( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'oneOf_4': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -149,13 +149,13 @@ class ComposedOneOfDifferentTypes( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ComposedOneOfDifferentTypes': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py index 86b17805c8a7..3ddde890852f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,10 +97,10 @@ class ComposedString( def __new__( cls, *args: typing.Union[str, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'ComposedString': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composition_in_property.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composition_in_property.py index 49fc619cfc2c..22c11f08f12b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composition_in_property.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composition_in_property.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -109,13 +109,13 @@ class CompositionInProperty( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'someProp': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -124,13 +124,13 @@ class CompositionInProperty( cls, *args: typing.Union[dict, frozendict, ], someProp: typing.Union[someProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'CompositionInProperty': return super().__new__( cls, *args, someProp=someProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py index af48c5f606b4..596551cc08c4 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py index 938f8b4f88dc..c8af4a13ca86 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -95,13 +95,13 @@ class DanishPig( cls, *args: typing.Union[dict, frozendict, ], className: className, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'DanishPig': return super().__new__( cls, *args, className=className, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py index fe399c0a759c..0eaa12b59d16 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py index d593ace1dec7..5c527be0d857 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py index 310dad4babf2..1904c75bf5fe 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py index 24c443deeb90..ac7566304df0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py index f48bfc6fb33b..8348b37bb385 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class Dog( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Dog': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog_all_of.py index 88c86c052618..cb9155bfd4c8 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class DogAllOf( cls, *args: typing.Union[dict, frozendict, ], breed: typing.Union[breed, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'DogAllOf': return super().__new__( cls, *args, breed=breed, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py index 4d61e721a6bb..ba0c560245ce 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -110,7 +110,7 @@ class Drawing( shapeOrNull: typing.Union['ShapeOrNull', Unset] = unset, nullableShape: typing.Union['NullableShape', Unset] = unset, shapes: typing.Union[shapes, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Drawing': return super().__new__( @@ -120,7 +120,7 @@ class Drawing( shapeOrNull=shapeOrNull, nullableShape=nullableShape, shapes=shapes, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py index 9ea913052e81..6f56d337f9f9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -125,7 +125,7 @@ class EnumArrays( *args: typing.Union[dict, frozendict, ], just_symbol: typing.Union[just_symbol, Unset] = unset, array_enum: typing.Union[array_enum, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'EnumArrays': return super().__new__( @@ -133,6 +133,6 @@ class EnumArrays( *args, just_symbol=just_symbol, array_enum=array_enum, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py index 17828f28029b..a8d67b2dab9e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py index 5f4fa186bc08..3f82faaa3e87 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -209,7 +209,7 @@ class EnumTest( StringEnumWithDefaultValue: typing.Union['StringEnumWithDefaultValue', Unset] = unset, IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', Unset] = unset, IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'EnumTest': return super().__new__( @@ -224,7 +224,7 @@ class EnumTest( StringEnumWithDefaultValue=StringEnumWithDefaultValue, IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue, IntegerEnumOneValue=IntegerEnumOneValue, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py index 5e96fa2799fa..9b105672ccfd 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class EquilateralTriangle( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'EquilateralTriangle': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle_all_of.py index 785966c5dda8..0094bf8a7356 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class EquilateralTriangleAllOf( cls, *args: typing.Union[dict, frozendict, ], triangleType: typing.Union[triangleType, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'EquilateralTriangleAllOf': return super().__new__( cls, *args, triangleType=triangleType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py index c5c048042c91..0f6d81d67850 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,13 +80,13 @@ class File( cls, *args: typing.Union[dict, frozendict, ], sourceURI: typing.Union[sourceURI, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'File': return super().__new__( cls, *args, sourceURI=sourceURI, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py index a6bf45a144b7..da66de4cea09 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -93,7 +93,7 @@ class FileSchemaTestClass( *args: typing.Union[dict, frozendict, ], file: typing.Union['File', Unset] = unset, files: typing.Union[files, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'FileSchemaTestClass': return super().__new__( @@ -101,7 +101,7 @@ class FileSchemaTestClass( *args, file=file, files=files, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py index 3535312831d3..e33a34d6e68a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class Foo( cls, *args: typing.Union[dict, frozendict, ], bar: typing.Union[bar, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Foo': return super().__new__( cls, *args, bar=bar, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py index 4a5e0140489e..33488e9e9da0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -225,7 +225,7 @@ class FormatTest( pattern_with_digits: typing.Union[pattern_with_digits, Unset] = unset, pattern_with_digits_and_delimiter: typing.Union[pattern_with_digits_and_delimiter, Unset] = unset, noneProp: typing.Union[noneProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'FormatTest': return super().__new__( @@ -251,6 +251,6 @@ class FormatTest( pattern_with_digits=pattern_with_digits, pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter, noneProp=noneProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py index 37b155280237..52c5c7aab57b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -98,14 +98,14 @@ class Fruit( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], color: typing.Union[color, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Fruit': return super().__new__( cls, *args, color=color, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py index 6f5098eaaf54..53e0a8b3afc9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -98,13 +98,13 @@ class FruitReq( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'FruitReq': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py index 03b81dffb459..b49581a16b62 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -98,14 +98,14 @@ class GmFruit( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], color: typing.Union[color, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'GmFruit': return super().__new__( cls, *args, color=color, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py index d99b83df17a8..2e4f462d9da7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -91,14 +91,14 @@ class GrandparentAnimal( cls, *args: typing.Union[dict, frozendict, ], pet_type: pet_type, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'GrandparentAnimal': return super().__new__( cls, *args, pet_type=pet_type, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py index bec74170f914..81d3661bd5a4 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,7 +80,7 @@ class HasOnlyReadOnly( *args: typing.Union[dict, frozendict, ], bar: typing.Union[bar, Unset] = unset, foo: typing.Union[foo, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'HasOnlyReadOnly': return super().__new__( @@ -88,6 +88,6 @@ class HasOnlyReadOnly( *args, bar=bar, foo=foo, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py index 28cace6c66df..d91afa53f58c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -85,12 +85,12 @@ class HealthCheckResult( def __new__( cls, *args: typing.Union[str, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'NullableMessage': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -98,13 +98,13 @@ class HealthCheckResult( cls, *args: typing.Union[dict, frozendict, ], NullableMessage: typing.Union[NullableMessage, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'HealthCheckResult': return super().__new__( cls, *args, NullableMessage=NullableMessage, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_response_default.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_response_default.py index 474bc2f1b6bb..6354bbc1b51e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_response_default.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_response_default.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -82,14 +82,14 @@ class InlineResponseDefault( cls, *args: typing.Union[dict, frozendict, ], string: typing.Union['Foo', Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'InlineResponseDefault': return super().__new__( cls, *args, string=string, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py index f9ce559597f3..c84faf0649f1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py index 2ce5bf788e24..1d40c6b3ecf1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py index 2a401beda7b2..101a6b0dfc61 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py index 198416fa503a..9c6387d7e308 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py index d553aa4002f7..1458e6f6f0d9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py index d1be99d4e438..d29d444f2f5a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py index 3a922c9c856c..2868d6d93522 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class IsoscelesTriangle( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'IsoscelesTriangle': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle_all_of.py index 57612019a9e6..f9a96472196b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class IsoscelesTriangleAllOf( cls, *args: typing.Union[dict, frozendict, ], triangleType: typing.Union[triangleType, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'IsoscelesTriangleAllOf': return super().__new__( cls, *args, triangleType=triangleType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py index a819f0a5e46f..31525a3ab80f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -108,13 +108,13 @@ class Mammal( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Mammal': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py index 640f40bac9a6..6776bad6d93c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -87,13 +87,13 @@ class MapTest( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_additional_properties': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -101,13 +101,13 @@ class MapTest( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map_map_of_string': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -141,13 +141,13 @@ class MapTest( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map_of_enum_string': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -161,13 +161,13 @@ class MapTest( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'direct_map': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -184,7 +184,7 @@ class MapTest( map_of_enum_string: typing.Union[map_of_enum_string, Unset] = unset, direct_map: typing.Union[direct_map, Unset] = unset, indirect_map: typing.Union['StringBooleanMap', Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'MapTest': return super().__new__( @@ -194,7 +194,7 @@ class MapTest( map_of_enum_string=map_of_enum_string, direct_map=direct_map, indirect_map=indirect_map, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py index ee0bf81b1a0d..de6e82588446 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -88,13 +88,13 @@ class MixedPropertiesAndAdditionalPropertiesClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'map': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -105,7 +105,7 @@ class MixedPropertiesAndAdditionalPropertiesClass( uuid: typing.Union[uuid, Unset] = unset, dateTime: typing.Union[dateTime, Unset] = unset, map: typing.Union[map, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'MixedPropertiesAndAdditionalPropertiesClass': return super().__new__( @@ -114,7 +114,7 @@ class MixedPropertiesAndAdditionalPropertiesClass( uuid=uuid, dateTime=dateTime, map=map, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py index 98b30389ae44..da8c9d0d86a6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -82,13 +82,13 @@ class Model200Response( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], name: typing.Union[name, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Model200Response': return super().__new__( cls, *args, name=name, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py index a3bfcac60190..6785ae9cef23 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,12 +80,12 @@ class ModelReturn( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ModelReturn': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py index aa107446c43d..04afed1a7749 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -88,7 +88,7 @@ class Money( *args: typing.Union[dict, frozendict, ], amount: amount, currency: currency, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Money': return super().__new__( @@ -96,7 +96,7 @@ class Money( *args, amount=amount, currency=currency, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py index 3be7a9658b5e..0c8ea4e15aff 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -87,7 +87,7 @@ class Name( *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], name: name, snake_case: typing.Union[snake_case, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Name': return super().__new__( @@ -95,6 +95,6 @@ class Name( *args, name=name, snake_case=snake_case, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py index a504545ae442..171d2258af55 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -84,12 +84,12 @@ class NoAdditionalProperties( *args: typing.Union[dict, frozendict, ], id: id, petId: typing.Union[petId, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'NoAdditionalProperties': return super().__new__( cls, *args, id=id, petId=petId, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py index 821225c10255..4812bccb0c72 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -83,12 +83,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[int, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'integer_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -102,12 +102,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[float, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'number_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -121,12 +121,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[bool, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'boolean_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -140,12 +140,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[str, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'string_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -159,12 +159,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'date_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -178,12 +178,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'datetime_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -197,12 +197,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[list, tuple, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'array_nullable_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -216,12 +216,12 @@ class NullableClass( def __new__( cls, *args: typing.Union[list, tuple, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'array_and_items_nullable_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) @@ -240,13 +240,13 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_items': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -262,13 +262,13 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'object_nullable_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -291,26 +291,26 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_additional_properties': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'object_and_items_nullable_prop': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -330,13 +330,13 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_additional_properties': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -344,13 +344,13 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'object_items_nullable': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -365,13 +365,13 @@ class NullableClass( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> '_additional_properties': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -391,7 +391,7 @@ class NullableClass( object_nullable_prop: typing.Union[object_nullable_prop, Unset] = unset, object_and_items_nullable_prop: typing.Union[object_and_items_nullable_prop, Unset] = unset, object_items_nullable: typing.Union[object_items_nullable, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'NullableClass': return super().__new__( @@ -409,6 +409,6 @@ class NullableClass( object_nullable_prop=object_nullable_prop, object_and_items_nullable_prop=object_and_items_nullable_prop, object_items_nullable=object_items_nullable, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py index 14193cfacbec..a219893fbaa1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -110,13 +110,13 @@ class NullableShape( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'NullableShape': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py index a311a0c656ed..987f2a371596 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,10 +78,10 @@ class NullableString( def __new__( cls, *args: typing.Union[str, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'NullableString': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py index 23b3e0befb28..82148f83add9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py index 698cbc0b7846..f34d96909fa3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -78,13 +78,13 @@ class NumberOnly( cls, *args: typing.Union[dict, frozendict, ], JustNumber: typing.Union[JustNumber, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'NumberOnly': return super().__new__( cls, *args, JustNumber=JustNumber, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py index 129a0eacb17d..ed0714bf90fb 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py index 1a230f98b737..9fc8af65acde 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py index b16983b11558..fd9839f9c90a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -88,7 +88,7 @@ class ObjectModelWithRefProps( myNumber: typing.Union['NumberWithValidations', Unset] = unset, myString: typing.Union[myString, Unset] = unset, myBoolean: typing.Union[myBoolean, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ObjectModelWithRefProps': return super().__new__( @@ -97,7 +97,7 @@ class ObjectModelWithRefProps( myNumber=myNumber, myString=myString, myBoolean=myBoolean, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py index c840eab6369f..b9ecbec7b4a7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -86,7 +86,7 @@ class ObjectWithDecimalProperties( length: typing.Union[length, Unset] = unset, width: typing.Union[width, Unset] = unset, cost: typing.Union['Money', Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ObjectWithDecimalProperties': return super().__new__( @@ -95,7 +95,7 @@ class ObjectWithDecimalProperties( length=length, width=width, cost=cost, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py index 595655019ed7..857143f86488 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -90,12 +90,12 @@ class ObjectWithDifficultlyNamedProps( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ObjectWithDifficultlyNamedProps': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py index 16d6e23cb24e..2318269e8a42 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -109,13 +109,13 @@ class ObjectWithInlineCompositionProperty( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'someProp': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) @@ -124,13 +124,13 @@ class ObjectWithInlineCompositionProperty( cls, *args: typing.Union[dict, frozendict, ], someProp: typing.Union[someProp, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ObjectWithInlineCompositionProperty': return super().__new__( cls, *args, someProp=someProp, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py index 91be6d02d1a8..4bf41af5c466 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -79,12 +79,12 @@ class ObjectWithValidations( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ObjectWithValidations': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py index 6f06e85a3be2..343ca34cc5cc 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -114,7 +114,7 @@ class Order( shipDate: typing.Union[shipDate, Unset] = unset, status: typing.Union[status, Unset] = unset, complete: typing.Union[complete, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Order': return super().__new__( @@ -126,6 +126,6 @@ class Order( shipDate=shipDate, status=status, complete=complete, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py index d93f03e849f2..20004fa3fc99 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -105,13 +105,13 @@ class ParentPet( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ParentPet': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py index acdcad0903e5..400fc3cebe47 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -138,7 +138,7 @@ class Pet( category: typing.Union['Category', Unset] = unset, tags: typing.Union[tags, Unset] = unset, status: typing.Union[status, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Pet': return super().__new__( @@ -150,7 +150,7 @@ class Pet( category=category, tags=tags, status=status, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py index 55baf6a7b35c..adfe1fea39f1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -106,13 +106,13 @@ class Pig( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Pig': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py index 56b09a2024f2..13871d566de9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -86,7 +86,7 @@ class Player( *args: typing.Union[dict, frozendict, ], name: typing.Union[name, Unset] = unset, enemyPlayer: typing.Union['Player', Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Player': return super().__new__( @@ -94,6 +94,6 @@ class Player( *args, name=name, enemyPlayer=enemyPlayer, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py index 2aecf52210ef..e127013a4127 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -106,13 +106,13 @@ class Quadrilateral( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Quadrilateral': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py index 384d18d11812..4b3b3f64070f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,7 +97,7 @@ class QuadrilateralInterface( *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], shapeType: shapeType, quadrilateralType: quadrilateralType, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'QuadrilateralInterface': return super().__new__( @@ -105,6 +105,6 @@ class QuadrilateralInterface( *args, shapeType=shapeType, quadrilateralType=quadrilateralType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py index 5a4c783fa0b8..6813a6a665bf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,7 +80,7 @@ class ReadOnlyFirst( *args: typing.Union[dict, frozendict, ], bar: typing.Union[bar, Unset] = unset, baz: typing.Union[baz, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ReadOnlyFirst': return super().__new__( @@ -88,6 +88,6 @@ class ReadOnlyFirst( *args, bar=bar, baz=baz, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py index 83fd87c719d5..20af1fdfa5b4 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class ScaleneTriangle( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ScaleneTriangle': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle_all_of.py index 5a3d2514eb46..551a5991a805 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class ScaleneTriangleAllOf( cls, *args: typing.Union[dict, frozendict, ], triangleType: typing.Union[triangleType, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ScaleneTriangleAllOf': return super().__new__( cls, *args, triangleType=triangleType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py index b29f83c9976d..4c347898fa84 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -106,13 +106,13 @@ class Shape( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Shape': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py index 8275e48bb955..0d5e42fcba43 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -110,13 +110,13 @@ class ShapeOrNull( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'ShapeOrNull': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py index 273512a90138..e6afc2c14b50 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -96,13 +96,13 @@ class SimpleQuadrilateral( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SimpleQuadrilateral': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral_all_of.py index f45e4a2bb0dd..a84205f2f9f8 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral_all_of.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral_all_of.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class SimpleQuadrilateralAllOf( cls, *args: typing.Union[dict, frozendict, ], quadrilateralType: typing.Union[quadrilateralType, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SimpleQuadrilateralAllOf': return super().__new__( cls, *args, quadrilateralType=quadrilateralType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py index 1565cd8b9793..a5103057cdde 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -95,13 +95,13 @@ class SomeObject( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SomeObject': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py index 09c039f8fe60..1c2c38f7831d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,13 +80,13 @@ class SpecialModelName( cls, *args: typing.Union[dict, frozendict, ], a: typing.Union[a, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'SpecialModelName': return super().__new__( cls, *args, a=a, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py index 2b661afe3c24..8f0c2b0e0f69 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py index cead5d15b7bd..1828f65f8139 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -77,12 +77,12 @@ class StringBooleanMap( def __new__( cls, *args: typing.Union[dict, frozendict, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'StringBooleanMap': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py index b96f2559062d..87c168cb0137 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -130,10 +130,10 @@ lines''') def __new__( cls, *args: typing.Union[str, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, ) -> 'StringEnum': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py index c2547b157a66..d60c3115eadf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py index 8bbc226e3476..61a533a9d3f5 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py index 2e533571785e..7cf869932285 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -80,7 +80,7 @@ class Tag( *args: typing.Union[dict, frozendict, ], id: typing.Union[id, Unset] = unset, name: typing.Union[name, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Tag': return super().__new__( @@ -88,6 +88,6 @@ class Tag( *args, id=id, name=name, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py index 115cde5048f3..bf4062c15046 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -108,13 +108,13 @@ class Triangle( def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Triangle': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py index 83428cd27113..2c2f274801a4 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -97,7 +97,7 @@ class TriangleInterface( *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], shapeType: shapeType, triangleType: triangleType, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'TriangleInterface': return super().__new__( @@ -105,6 +105,6 @@ class TriangleInterface( *args, shapeType=shapeType, triangleType=triangleType, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py index 1de764931197..a8c3355a5c55 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -92,13 +92,13 @@ class User( def __new__( cls, *args: typing.Union[dict, frozendict, None, ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'objectWithNoDeclaredPropsNullable': return super().__new__( cls, *args, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) anyTypeProp = AnyTypeSchema @@ -120,7 +120,7 @@ class User( objectWithNoDeclaredPropsNullable: typing.Union[objectWithNoDeclaredPropsNullable, Unset] = unset, anyTypeProp: typing.Union[anyTypeProp, Unset] = unset, anyTypePropNullable: typing.Union[anyTypePropNullable, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'User': return super().__new__( @@ -138,6 +138,6 @@ class User( objectWithNoDeclaredPropsNullable=objectWithNoDeclaredPropsNullable, anyTypeProp=anyTypeProp, anyTypePropNullable=anyTypePropNullable, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py index d33c830522f0..45cee6bfcd9f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -99,7 +99,7 @@ class Whale( className: className, hasBaleen: typing.Union[hasBaleen, Unset] = unset, hasTeeth: typing.Union[hasTeeth, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Whale': return super().__new__( @@ -108,6 +108,6 @@ class Whale( className=className, hasBaleen=hasBaleen, hasTeeth=hasTeeth, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py index 2ea5d4039ce7..3b3fe6cac406 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py @@ -38,7 +38,7 @@ from petstore_api.schemas import ( # noqa: F401 BinarySchema, NoneSchema, none_type, - InstantiationMetadata, + Configuration, Unset, unset, ComposedBase, @@ -123,7 +123,7 @@ class Zebra( *args: typing.Union[dict, frozendict, ], className: className, type: typing.Union[type, Unset] = unset, - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], ) -> 'Zebra': return super().__new__( @@ -131,6 +131,6 @@ class Zebra( *args, className=className, type=type, - _instantiation_metadata=_instantiation_metadata, + _configuration=_configuration, **kwargs, ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py index 58ffd544224b..1d0861194acc 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py @@ -9,7 +9,7 @@ Generated by: https://openapi-generator.tech """ -from collections import defaultdict +from collections import defaultdict, abc from datetime import date, datetime, timedelta # noqa: F401 from dataclasses import dataclass import functools @@ -70,21 +70,22 @@ def update(d: dict, u: dict): for k, v in u.items(): if not v: continue - d[k] = d[k] | v - return d + if k not in d: + d[k] = v + else: + d[k] = d[k] | v -class InstantiationMetadata: +class ValidationMetadata(frozendict): """ - A class to store metadata that is needed when instantiating OpenApi Schema subclasses + A class storing metadata that is needed to validate OpenApi Schema payloads """ - def __init__( - self, + def __new__( + cls, path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']), from_server: bool = False, configuration: typing.Optional[Configuration] = None, base_classes: typing.FrozenSet[typing.Type] = frozenset(), - path_to_schemas: typing.Optional[typing.Dict[str, typing.Set[typing.Type]]] = None, ): """ Args: @@ -98,23 +99,30 @@ class InstantiationMetadata: - one can disable validation checking base_classes: when deserializing data that matches multiple schemas, this is used to store the schemas that have been traversed. This is used to stop processing when a cycle is seen. - path_to_schemas: a dict that goes from path to a list of classes at each path location """ - self.path_to_item = path_to_item - self.from_server = from_server - self.configuration = configuration - self.base_classes = base_classes - if path_to_schemas is None: - path_to_schemas = defaultdict(set) - self.path_to_schemas = path_to_schemas + return super().__new__( + cls, + path_to_item=path_to_item, + from_server=from_server, + configuration=configuration, + base_classes=base_classes, + ) - def __repr__(self): - return str(self.__dict__) + @property + def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]: + return self.get('path_to_item') - def __eq__(self, other): - if not isinstance(other, InstantiationMetadata): - return False - return self.__dict__ == other.__dict__ + @property + def from_server(self) -> bool: + return self.get('from_server') + + @property + def configuration(self) -> typing.Optional[Configuration]: + return self.get('configuration') + + @property + def base_classes(self) -> typing.FrozenSet[typing.Type]: + return self.get('base_classes') class ValidatorBase: @@ -148,30 +156,30 @@ class ValidatorBase: @classmethod def __check_str_validations(cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxLength', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxLength', validation_metadata.configuration) and 'max_length' in validations and len(input_values) > validations['max_length']): cls.__raise_validation_error_message( value=input_values, constraint_msg="length must be less than or equal to", constraint_value=validations['max_length'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minLength', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minLength', validation_metadata.configuration) and 'min_length' in validations and len(input_values) < validations['min_length']): cls.__raise_validation_error_message( value=input_values, constraint_msg="length must be greater than or equal to", constraint_value=validations['min_length'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) checked_value = input_values - if (cls.__is_json_validation_enabled('pattern', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('pattern', validation_metadata.configuration) and 'regex' in validations): for regex_dict in validations['regex']: flags = regex_dict.get('flags', 0) @@ -183,42 +191,42 @@ class ValidatorBase: value=input_values, constraint_msg="must match regular expression", constraint_value=regex_dict['pattern'], - path_to_item=_instantiation_metadata.path_to_item, + path_to_item=validation_metadata.path_to_item, additional_txt=" with flags=`{}`".format(flags) ) cls.__raise_validation_error_message( value=input_values, constraint_msg="must match regular expression", constraint_value=regex_dict['pattern'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_tuple_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxItems', validation_metadata.configuration) and 'max_items' in validations and len(input_values) > validations['max_items']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of items must be less than or equal to", constraint_value=validations['max_items'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minItems', validation_metadata.configuration) and 'min_items' in validations and len(input_values) < validations['min_items']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of items must be greater than or equal to", constraint_value=validations['min_items'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('uniqueItems', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('uniqueItems', validation_metadata.configuration) and 'unique_items' in validations and validations['unique_items'] and input_values): unique_items = [] for item in input_values: @@ -229,41 +237,41 @@ class ValidatorBase: value=input_values, constraint_msg="duplicate items were found, and the tuple must not contain duplicates because", constraint_value='unique_items==True', - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_dict_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): - if (cls.__is_json_validation_enabled('maxProperties', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maxProperties', validation_metadata.configuration) and 'max_properties' in validations and len(input_values) > validations['max_properties']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of properties must be less than or equal to", constraint_value=validations['max_properties'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minProperties', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minProperties', validation_metadata.configuration) and 'min_properties' in validations and len(input_values) < validations['min_properties']): cls.__raise_validation_error_message( value=input_values, constraint_msg="number of properties must be greater than or equal to", constraint_value=validations['min_properties'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod def __check_numeric_validations( cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata): + validation_metadata: ValidationMetadata): if cls.__is_json_validation_enabled('multipleOf', - _instantiation_metadata.configuration) and 'multiple_of' in validations: + validation_metadata.configuration) and 'multiple_of' in validations: multiple_of_values = validations['multiple_of'] for multiple_of_value in multiple_of_values: if (isinstance(input_values, decimal.Decimal) and @@ -274,7 +282,7 @@ class ValidatorBase: value=input_values, constraint_msg="value must be a multiple of", constraint_value=multiple_of_value, - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) checking_max_or_min_values = {'exclusive_maximum', 'inclusive_maximum', 'exclusive_minimum', @@ -284,44 +292,44 @@ class ValidatorBase: max_val = input_values min_val = input_values - if (cls.__is_json_validation_enabled('exclusiveMaximum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('exclusiveMaximum', validation_metadata.configuration) and 'exclusive_maximum' in validations and max_val >= validations['exclusive_maximum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value less than", constraint_value=validations['exclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('maximum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('maximum', validation_metadata.configuration) and 'inclusive_maximum' in validations and max_val > validations['inclusive_maximum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value less than or equal to", constraint_value=validations['inclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('exclusiveMinimum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('exclusiveMinimum', validation_metadata.configuration) and 'exclusive_minimum' in validations and min_val <= validations['exclusive_minimum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value greater than", constraint_value=validations['exclusive_maximum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) - if (cls.__is_json_validation_enabled('minimum', _instantiation_metadata.configuration) and + if (cls.__is_json_validation_enabled('minimum', validation_metadata.configuration) and 'inclusive_minimum' in validations and min_val < validations['inclusive_minimum']): cls.__raise_validation_error_message( value=input_values, constraint_msg="must be a value greater than or equal to", constraint_value=validations['inclusive_minimum'], - path_to_item=_instantiation_metadata.path_to_item + path_to_item=validation_metadata.path_to_item ) @classmethod @@ -329,18 +337,18 @@ class ValidatorBase: cls, validations, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): if isinstance(input_values, str): - cls.__check_str_validations(validations, input_values, _instantiation_metadata) + cls.__check_str_validations(validations, input_values, validation_metadata) elif isinstance(input_values, tuple): - cls.__check_tuple_validations(validations, input_values, _instantiation_metadata) + cls.__check_tuple_validations(validations, input_values, validation_metadata) elif isinstance(input_values, frozendict): - cls.__check_dict_validations(validations, input_values, _instantiation_metadata) + cls.__check_dict_validations(validations, input_values, validation_metadata) elif isinstance(input_values, decimal.Decimal): - cls.__check_numeric_validations(validations, input_values, _instantiation_metadata) + cls.__check_numeric_validations(validations, input_values, validation_metadata) try: - return super()._validate_validations_pass(input_values, _instantiation_metadata) + return super()._validate_validations_pass(input_values, validation_metadata) except AttributeError: return True @@ -349,7 +357,7 @@ class Validator(typing.Protocol): def _validate_validations_pass( cls, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): pass @@ -360,11 +368,11 @@ def _SchemaValidator(**validations: typing.Union[str, bool, None, int, float, li def _validate_validations_pass( cls, input_values, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): - cls._check_validations_for_types(validations, input_values, _instantiation_metadata) + cls._check_validations_for_types(validations, input_values, validation_metadata) try: - return super()._validate_validations_pass(input_values, _instantiation_metadata) + return super()._validate_validations_pass(input_values, validation_metadata) except AttributeError: return True @@ -596,7 +604,7 @@ class DateBase(StrBase): return DEFAULT_ISOPARSER.parse_isodate(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: DEFAULT_ISOPARSER.parse_isodate(arg) @@ -604,16 +612,20 @@ class DateBase(StrBase): except ValueError: raise ApiValueError( "Value does not conform to the required ISO-8601 date format. " - "Invalid value '{}' for type date at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): """ DateBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class DateTimeBase: @@ -623,7 +635,7 @@ class DateTimeBase: return DEFAULT_ISOPARSER.parse_isodatetime(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: DEFAULT_ISOPARSER.parse_isodatetime(arg) @@ -631,16 +643,20 @@ class DateTimeBase: except ValueError: raise ApiValueError( "Value does not conform to the required ISO-8601 datetime format. " - "Invalid value '{}' for type datetime at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DateTimeBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class DecimalBase(StrBase): @@ -656,7 +672,7 @@ class DecimalBase(StrBase): return decimal.Decimal(self) @classmethod - def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata): if isinstance(arg, str): try: decimal.Decimal(arg) @@ -664,16 +680,20 @@ class DecimalBase(StrBase): except decimal.InvalidOperation: raise ApiValueError( "Value cannot be converted to a decimal. " - "Invalid value '{}' for type decimal at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DecimalBase _validate """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class NumberBase: @@ -710,7 +730,7 @@ class NumberBase: class ListBase: @classmethod - def _validate_items(cls, list_items, _instantiation_metadata: InstantiationMetadata): + def _validate_items(cls, list_items, validation_metadata: ValidationMetadata): """ Ensures that: - values passed in for items are valid @@ -727,22 +747,26 @@ class ListBase: # if we have definitions for an items schema, use it # otherwise accept anything item_cls = getattr(cls, '_items', AnyTypeSchema) - path_to_schemas = defaultdict(set) + path_to_schemas = {} for i, value in enumerate(list_items): if isinstance(value, item_cls): continue - item_instantiation_metadata = InstantiationMetadata( - from_server=_instantiation_metadata.from_server, - configuration=_instantiation_metadata.configuration, - path_to_item=_instantiation_metadata.path_to_item+(i,) + item_validation_metadata = ValidationMetadata( + from_server=validation_metadata.from_server, + configuration=validation_metadata.configuration, + path_to_item=validation_metadata.path_to_item+(i,) ) other_path_to_schemas = item_cls._validate( - value, _instantiation_metadata=item_instantiation_metadata) + value, validation_metadata=item_validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ ListBase _validate We return dynamic classes of different bases depending upon the inputs @@ -758,34 +782,41 @@ class ListBase: ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - arg = args[0] - _path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) if not isinstance(arg, tuple): return _path_to_schemas - if cls in _instantiation_metadata.base_classes: + if cls in validation_metadata.base_classes: # we have already moved through this class so stop here return _path_to_schemas - _instantiation_metadata.base_classes |= frozenset({cls}) - other_path_to_schemas = cls._validate_items(arg, _instantiation_metadata=_instantiation_metadata) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) + other_path_to_schemas = cls._validate_items(arg, validation_metadata=updated_vm) update(_path_to_schemas, other_path_to_schemas) return _path_to_schemas @classmethod - def _get_items(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _get_items( + cls: 'Schema', + arg: typing.List[typing.Any], + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): ''' ListBase _get_items ''' - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - - list_items = args[0] + list_items = arg cast_items = [] # if we have definitions for an items schema, use it # otherwise accept anything cls_item_cls = getattr(cls, '_items', AnyTypeSchema) for i, value in enumerate(list_items): - item_path_to_item = _instantiation_metadata.path_to_item+(i,) - item_cls = _instantiation_metadata.path_to_schemas.get(item_path_to_item) + item_path_to_item = path_to_item + (i,) + item_cls = path_to_schemas.get(item_path_to_item) if item_cls is None: item_cls = cls_item_cls @@ -793,14 +824,11 @@ class ListBase: cast_items.append(value) continue - item_instantiation_metadata = InstantiationMetadata( - configuration=_instantiation_metadata.configuration, - from_server=_instantiation_metadata.from_server, - path_to_item=item_path_to_item, - path_to_schemas=_instantiation_metadata.path_to_schemas, - ) new_value = item_cls._get_new_instance_without_conversion( - value, _instantiation_metadata=item_instantiation_metadata) + value, + item_path_to_item, + path_to_schemas + ) cast_items.append(new_value) return cast_items @@ -808,12 +836,12 @@ class ListBase: class Discriminable: @classmethod - def _ensure_discriminator_value_present(cls, disc_property_name: str, _instantiation_metadata: InstantiationMetadata, *args): + def _ensure_discriminator_value_present(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args): if not args or args and disc_property_name not in args[0]: # The input data does not contain the discriminator property raise ApiValueError( "Cannot deserialize input data due to missing discriminator. " - "The discriminator property '{}' is missing at path: {}".format(disc_property_name, _instantiation_metadata.path_to_item) + "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item) ) @classmethod @@ -907,7 +935,7 @@ class DictBase(Discriminable): ) @classmethod - def _validate_args(cls, arg, _instantiation_metadata: InstantiationMetadata): + def _validate_args(cls, arg, validation_metadata: ValidationMetadata): """ Ensures that: - values passed in for properties are valid @@ -920,7 +948,7 @@ class DictBase(Discriminable): Raises: ApiTypeError - for missing required arguments, or for invalid properties """ - path_to_schemas = defaultdict(set) + path_to_schemas = {} for property_name, value in arg.items(): if property_name in cls._required_property_names or property_name in cls._property_names: schema = getattr(cls, property_name) @@ -928,21 +956,25 @@ class DictBase(Discriminable): schema = cls._additional_properties else: raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format( - value, cls, _instantiation_metadata.path_to_item+(property_name,) + value, cls, validation_metadata.path_to_item+(property_name,) )) if isinstance(value, schema): continue - arg_instantiation_metadata = InstantiationMetadata( - from_server=_instantiation_metadata.from_server, - configuration=_instantiation_metadata.configuration, - path_to_item=_instantiation_metadata.path_to_item+(property_name,) + arg_validation_metadata = ValidationMetadata( + from_server=validation_metadata.from_server, + configuration=validation_metadata.configuration, + path_to_item=validation_metadata.path_to_item+(property_name,) ) - other_path_to_schemas = schema._validate(value, _instantiation_metadata=arg_instantiation_metadata) + other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ DictBase _validate We return dynamic classes of different bases depending upon the inputs @@ -958,15 +990,14 @@ class DictBase(Discriminable): ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - if args and isinstance(args[0], cls): + if isinstance(arg, cls): # an instance of the correct type was passed in return {} - arg = args[0] - _path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) if not isinstance(arg, frozendict): return _path_to_schemas - cls._validate_arg_presence(args[0]) - other_path_to_schemas = cls._validate_args(args[0], _instantiation_metadata=_instantiation_metadata) + cls._validate_arg_presence(arg) + other_path_to_schemas = cls._validate_args(arg, validation_metadata=validation_metadata) update(_path_to_schemas, other_path_to_schemas) try: _discriminator = cls._discriminator @@ -974,7 +1005,7 @@ class DictBase(Discriminable): return _path_to_schemas # discriminator exists disc_prop_name = list(_discriminator.keys())[0] - cls._ensure_discriminator_value_present(disc_prop_name, _instantiation_metadata, *args) + cls._ensure_discriminator_value_present(disc_prop_name, validation_metadata, arg) discriminated_cls = cls._get_discriminated_class( disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name]) if discriminated_cls is None: @@ -983,14 +1014,19 @@ class DictBase(Discriminable): cls.__name__, disc_prop_name, list(_discriminator[disc_prop_name].keys()), - _instantiation_metadata.path_to_item + (disc_prop_name,) + validation_metadata.path_to_item + (disc_prop_name,) ) ) - if discriminated_cls in _instantiation_metadata.base_classes: + if discriminated_cls in validation_metadata.base_classes: # we have already moved through this class so stop here return _path_to_schemas - _instantiation_metadata.base_classes |= frozenset({cls}) - other_path_to_schemas = discriminated_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) + other_path_to_schemas = discriminated_cls._validate(arg, validation_metadata=updated_vm) update(_path_to_schemas, other_path_to_schemas) return _path_to_schemas @@ -1023,7 +1059,12 @@ class DictBase(Discriminable): return tuple(property_names) @classmethod - def _get_properties(cls, arg: typing.Dict[str, typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _get_properties( + cls, + arg: typing.Dict[str, typing.Any], + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): """ DictBase _get_properties, this is how properties are set These values already passed validation @@ -1032,12 +1073,10 @@ class DictBase(Discriminable): # if we have definitions for property schemas convert values using it # otherwise accept anything - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - for property_name_js, value in arg.items(): property_cls = getattr(cls, property_name_js, cls._additional_properties) - property_path_to_item = _instantiation_metadata.path_to_item+(property_name_js,) - stored_property_cls = _instantiation_metadata.path_to_schemas.get(property_path_to_item) + property_path_to_item = path_to_item + (property_name_js,) + stored_property_cls = path_to_schemas.get(property_path_to_item) if stored_property_cls: property_cls = stored_property_cls @@ -1045,14 +1084,11 @@ class DictBase(Discriminable): dict_items[property_name_js] = value continue - prop_instantiation_metadata = InstantiationMetadata( - configuration=_instantiation_metadata.configuration, - from_server=_instantiation_metadata.from_server, - path_to_item=property_path_to_item, - path_to_schemas=_instantiation_metadata.path_to_schemas, - ) new_value = property_cls._get_new_instance_without_conversion( - value, _instantiation_metadata=prop_instantiation_metadata) + value, + property_path_to_item, + path_to_schemas + ) dict_items[property_name_js] = new_value return dict_items @@ -1196,7 +1232,11 @@ class Schema: return new_cls @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ Schema _validate Runs all schema validation logic and @@ -1224,21 +1264,21 @@ class Schema: ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - arg = args[0] - base_class = cls.__get_simple_class(arg) failed_type_check_classes = cls._validate_type(base_class) if failed_type_check_classes: raise cls.__get_type_error( arg, - _instantiation_metadata.path_to_item, + validation_metadata.path_to_item, failed_type_check_classes, key_type=False, ) if hasattr(cls, '_validate_validations_pass'): - cls._validate_validations_pass(arg, _instantiation_metadata) - path_to_schemas = defaultdict(set) - path_to_schemas[_instantiation_metadata.path_to_item].add(cls) + cls._validate_validations_pass(arg, validation_metadata) + path_to_schemas = {} + if validation_metadata.path_to_item not in path_to_schemas: + path_to_schemas[validation_metadata.path_to_item] = set() + path_to_schemas[validation_metadata.path_to_item].add(cls) if hasattr(cls, "_enum_by_value"): cls._validate_enum_value(arg) @@ -1247,7 +1287,7 @@ class Schema: if base_class is none_type or base_class is bool: return path_to_schemas - path_to_schemas[_instantiation_metadata.path_to_item].add(base_class) + path_to_schemas[validation_metadata.path_to_item].add(base_class) return path_to_schemas @classmethod @@ -1258,20 +1298,18 @@ class Schema: raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name)) @classmethod - def __get_new_cls(cls, arg, _instantiation_metadata: InstantiationMetadata): + def __get_new_cls( + cls, + arg, + validation_metadata: ValidationMetadata + ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], 'Schema']: """ - PATH 1 - make a new dynamic class and return an instance of that class + Make a new dynamic class and return an instance of that class We are making an instance of cls, but instead of making cls make a new class, new_cls which includes dynamic bases including cls return an instance of that new class - """ - if ( - _instantiation_metadata.path_to_schemas and - _instantiation_metadata.path_to_item in _instantiation_metadata.path_to_schemas): - chosen_new_cls = _instantiation_metadata.path_to_schemas[_instantiation_metadata.path_to_item] - return chosen_new_cls - """ + Dict property + List Item Assignment Use cases: 1. value is NOT an instance of the required schema class the value is validated by _validate @@ -1284,8 +1322,10 @@ class Schema: and in list/dict _get_items,_get_properties the value will be directly assigned because value is of the correct type, and validation was run earlier when the instance was created """ - _path_to_schemas = cls._validate(arg, _instantiation_metadata=_instantiation_metadata) + _path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata) # loop through it make a new class for each entry + # do not modify the returned result because it is cached and we would be modifying the cached value + path_to_schemas = {} for path, schema_classes in _path_to_schemas.items(): enum_schema = any( hasattr(this_cls, '_enum_by_value') for this_cls in schema_classes) @@ -1311,7 +1351,7 @@ class Schema: mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes) if inheritable_primitive_type and not enum_schema: - _instantiation_metadata.path_to_schemas[path] = mfg_cls + path_to_schemas[path] = mfg_cls continue # Use case: value is None, True, False, or an enum value @@ -1326,18 +1366,23 @@ class Schema: mfg_cls = mfg_cls._class_by_base_class(none_type) else: raise ApiValueError('Unhandled case value={} bases={}'.format(value, mfg_cls.__bases__)) - _instantiation_metadata.path_to_schemas[path] = mfg_cls + path_to_schemas[path] = mfg_cls - return _instantiation_metadata.path_to_schemas[_instantiation_metadata.path_to_item] + return path_to_schemas @classmethod - def _get_new_instance_without_conversion(cls, arg, _instantiation_metadata): - # PATH 2 - we have a Dynamic class and we are making an instance of it + def _get_new_instance_without_conversion( + cls: 'Schema', + arg: typing.Any, + path_to_item: typing.Tuple[typing.Union[str, int], ...], + path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']] + ): + # We have a Dynamic class and we are making an instance of it if issubclass(cls, frozendict): - properties = cls._get_properties(arg, _instantiation_metadata=_instantiation_metadata) + properties = cls._get_properties(arg, path_to_item, path_to_schemas) return super(Schema, cls).__new__(cls, properties) elif issubclass(cls, tuple): - items = cls._get_items(arg, _instantiation_metadata=_instantiation_metadata) + items = cls._get_items(arg, path_to_item, path_to_schemas) return super(Schema, cls).__new__(cls, items) """ str = openapi str, date, and datetime @@ -1368,16 +1413,20 @@ class Schema: io.BufferedReader, bytes ], - _instantiation_metadata: typing.Optional[InstantiationMetadata] + _configuration: typing.Optional[Configuration] ): + """ + Schema _from_openapi_data + """ arg = cast_to_allowed_types(arg, from_server=True) - _instantiation_metadata = InstantiationMetadata(from_server=True) if _instantiation_metadata is None else _instantiation_metadata - if not _instantiation_metadata.from_server: - raise ApiValueError( - 'from_server must be True in this code path, if you need it to be False, use cls()' - ) - new_cls = cls.__get_new_cls(arg, _instantiation_metadata) - new_inst = new_cls._get_new_instance_without_conversion(arg, _instantiation_metadata) + validation_metadata = ValidationMetadata(from_server=True, configuration=_configuration) + path_to_schemas = cls.__get_new_cls(arg, validation_metadata) + new_cls = path_to_schemas[validation_metadata.path_to_item] + new_inst = new_cls._get_new_instance_without_conversion( + arg, + validation_metadata.path_to_item, + path_to_schemas + ) return new_inst @staticmethod @@ -1393,14 +1442,15 @@ class Schema: def __remove_unsets(kwargs): return {key: val for key, val in kwargs.items() if val is not unset} - def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]): + def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]): """ Schema __new__ Args: args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): the value kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): dict values - _instantiation_metadata: contains the needed from_server, configuration, path_to_item + _configuration: contains the Configuration that enables json schema validation keywords + like minItems, minLength etc """ kwargs = cls.__remove_unsets(kwargs) if not args and not kwargs: @@ -1411,20 +1461,21 @@ class Schema: arg = args[0] else: arg = cls.__get_input_dict(*args, **kwargs) - _instantiation_metadata = InstantiationMetadata() if _instantiation_metadata is None else _instantiation_metadata - if _instantiation_metadata.from_server: - raise ApiValueError( - 'from_server must be False in this code path, if you need it to be True, use cls._from_openapi_data()' - ) - arg = cast_to_allowed_types(arg, from_server=_instantiation_metadata.from_server) - new_cls = cls.__get_new_cls(arg, _instantiation_metadata) - return new_cls._get_new_instance_without_conversion(arg, _instantiation_metadata) + validation_metadata = ValidationMetadata(configuration=_configuration, from_server=False) + arg = cast_to_allowed_types(arg, from_server=validation_metadata.from_server) + path_to_schemas = cls.__get_new_cls(arg, validation_metadata) + new_cls = path_to_schemas[validation_metadata.path_to_item] + return new_cls._get_new_instance_without_conversion( + arg, + validation_metadata.path_to_item, + path_to_schemas + ) def __init__( self, *args: typing.Union[ dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], - _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, + _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[ dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset ] @@ -1454,6 +1505,8 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal because isinstance(True, int) is True """ return arg + elif isinstance(arg, int): + return decimal.Decimal(arg) elif isinstance(arg, float): decimal_from_float = decimal.Decimal(arg) if decimal_from_float.as_integer_ratio()[1] == 1: @@ -1463,8 +1516,6 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal return decimal_from_float elif type(arg) is list or type(arg) is tuple: return tuple([cast_to_allowed_types(item) for item in arg]) - elif isinstance(arg, int): - return decimal.Decimal(arg) elif arg is None: return arg elif isinstance(arg, (date, datetime)): @@ -1476,6 +1527,8 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal return arg elif isinstance(arg, bytes): return arg + elif isinstance(arg, decimal.Decimal): + return arg elif isinstance(arg, (io.FileIO, io.BufferedReader)): if arg.closed: raise ApiValueError('Invalid file state; file is closed and must be open') @@ -1488,12 +1541,12 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal class ComposedBase(Discriminable): @classmethod - def __get_allof_classes(cls, *args, _instantiation_metadata: InstantiationMetadata): + def __get_allof_classes(cls, *args, validation_metadata: ValidationMetadata): path_to_schemas = defaultdict(set) for allof_cls in cls._composed_schemas['allOf']: - if allof_cls in _instantiation_metadata.base_classes: + if allof_cls in validation_metadata.base_classes: continue - other_path_to_schemas = allof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = allof_cls._validate(*args, validation_metadata=validation_metadata) update(path_to_schemas, other_path_to_schemas) return path_to_schemas @@ -1502,16 +1555,16 @@ class ComposedBase(Discriminable): cls, *args, discriminated_cls, - _instantiation_metadata: InstantiationMetadata, + validation_metadata: ValidationMetadata, path_to_schemas: typing.Dict[typing.Tuple, typing.Set[typing.Type[Schema]]] ): oneof_classes = [] chosen_oneof_cls = None - original_base_classes = _instantiation_metadata.base_classes - new_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes + new_base_classes = validation_metadata.base_classes path_to_schemas = defaultdict(set) for oneof_cls in cls._composed_schemas['oneOf']: - if oneof_cls in path_to_schemas[_instantiation_metadata.path_to_item]: + if oneof_cls in path_to_schemas[validation_metadata.path_to_item]: oneof_classes.append(oneof_cls) continue if isinstance(args[0], oneof_cls): @@ -1519,10 +1572,9 @@ class ComposedBase(Discriminable): chosen_oneof_cls = oneof_cls oneof_classes.append(oneof_cls) continue - _instantiation_metadata.base_classes = original_base_classes try: - path_to_schemas = oneof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) - new_base_classes = _instantiation_metadata.base_classes + path_to_schemas = oneof_cls._validate(*args, validation_metadata=validation_metadata) + new_base_classes = validation_metadata.base_classes except (ApiValueError, ApiTypeError) as ex: if discriminated_cls is not None and oneof_cls is discriminated_cls: raise ex @@ -1539,7 +1591,6 @@ class ComposedBase(Discriminable): "Invalid inputs given to generate an instance of {}. Multiple " "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes) ) - _instantiation_metadata.base_classes = new_base_classes return path_to_schemas @classmethod @@ -1547,14 +1598,14 @@ class ComposedBase(Discriminable): cls, *args, discriminated_cls, - _instantiation_metadata: InstantiationMetadata + validation_metadata: ValidationMetadata ): anyof_classes = [] chosen_anyof_cls = None - original_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes path_to_schemas = defaultdict(set) for anyof_cls in cls._composed_schemas['anyOf']: - if anyof_cls in _instantiation_metadata.base_classes: + if anyof_cls in validation_metadata.base_classes: continue if isinstance(args[0], anyof_cls): # passed in instance is the correct type @@ -1562,14 +1613,13 @@ class ComposedBase(Discriminable): anyof_classes.append(anyof_cls) continue - _instantiation_metadata.base_classes = original_base_classes try: - other_path_to_schemas = anyof_cls._validate(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = anyof_cls._validate(*args, validation_metadata=validation_metadata) except (ApiValueError, ApiTypeError) as ex: if discriminated_cls is not None and anyof_cls is discriminated_cls: raise ex continue - original_base_classes = _instantiation_metadata.base_classes + original_base_classes = validation_metadata.base_classes chosen_anyof_cls = anyof_cls anyof_classes.append(anyof_cls) update(path_to_schemas, other_path_to_schemas) @@ -1581,7 +1631,11 @@ class ComposedBase(Discriminable): return path_to_schemas @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ ComposedBase _validate We return dynamic classes of different bases depending upon the inputs @@ -1597,65 +1651,70 @@ class ComposedBase(Discriminable): ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes ApiTypeError: when the input type is not in the list of allowed spec types """ - if args and isinstance(args[0], Schema) and _instantiation_metadata.from_server is False: - if isinstance(args[0], cls): + if isinstance(arg, Schema) and validation_metadata.from_server is False: + if isinstance(arg, cls): # an instance of the correct type was passed in return {} raise ApiTypeError( 'Incorrect type passed in, required type was {} and passed type was {} at {}'.format( cls, - type(args[0]), - _instantiation_metadata.path_to_item + type(arg), + validation_metadata.path_to_item ) ) # validation checking on types, validations, and enums - path_to_schemas = super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + path_to_schemas = super()._validate(arg, validation_metadata=validation_metadata) - _instantiation_metadata.base_classes |= frozenset({cls}) + updated_vm = ValidationMetadata( + configuration=validation_metadata.configuration, + from_server=validation_metadata.from_server, + path_to_item=validation_metadata.path_to_item, + base_classes=validation_metadata.base_classes | frozenset({cls}) + ) # process composed schema _discriminator = getattr(cls, '_discriminator', None) discriminated_cls = None - if _discriminator and args and isinstance(args[0], frozendict): + if _discriminator and arg and isinstance(arg, frozendict): disc_property_name = list(_discriminator.keys())[0] - cls._ensure_discriminator_value_present(disc_property_name, _instantiation_metadata, *args) + cls._ensure_discriminator_value_present(disc_property_name, updated_vm, arg) # get discriminated_cls by looking at the dict in the current class discriminated_cls = cls._get_discriminated_class( - disc_property_name=disc_property_name, disc_payload_value=args[0][disc_property_name]) + disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name]) if discriminated_cls is None: raise ApiValueError( "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format( - args[0][disc_property_name], + arg[disc_property_name], cls.__name__, disc_property_name, list(_discriminator[disc_property_name].keys()), - _instantiation_metadata.path_to_item + (disc_property_name,) + updated_vm.path_to_item + (disc_property_name,) ) ) if cls._composed_schemas['allOf']: - other_path_to_schemas = cls.__get_allof_classes(*args, _instantiation_metadata=_instantiation_metadata) + other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm) update(path_to_schemas, other_path_to_schemas) if cls._composed_schemas['oneOf']: other_path_to_schemas = cls.__get_oneof_class( - *args, + arg, discriminated_cls=discriminated_cls, - _instantiation_metadata=_instantiation_metadata, + validation_metadata=updated_vm, path_to_schemas=path_to_schemas ) update(path_to_schemas, other_path_to_schemas) if cls._composed_schemas['anyOf']: other_path_to_schemas = cls.__get_anyof_classes( - *args, + arg, discriminated_cls=discriminated_cls, - _instantiation_metadata=_instantiation_metadata + validation_metadata=updated_vm ) update(path_to_schemas, other_path_to_schemas) if discriminated_cls is not None: # TODO use an exception from this package here - assert discriminated_cls in path_to_schemas[_instantiation_metadata.path_to_item] + assert discriminated_cls in path_to_schemas[updated_vm.path_to_item] return path_to_schemas @@ -1676,12 +1735,12 @@ class ComposedSchema( _composed_schemas = {} @classmethod - def _from_openapi_data(cls, *args: typing.Any, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs): + def _from_openapi_data(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs): if not args: if not kwargs: raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__)) args = (kwargs, ) - return super()._from_openapi_data(args[0], _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(args[0], _configuration=_configuration) class ListSchema( @@ -1691,10 +1750,10 @@ class ListSchema( ): @classmethod - def _from_openapi_data(cls, arg: typing.List[typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[list, tuple], **kwargs: InstantiationMetadata): + def __new__(cls, arg: typing.Union[list, tuple], **kwargs: ValidationMetadata): return super().__new__(cls, arg, **kwargs) @@ -1705,10 +1764,10 @@ class NoneSchema( ): @classmethod - def _from_openapi_data(cls, arg: None, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: None, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: None, **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: None, **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1723,10 +1782,10 @@ class NumberSchema( """ @classmethod - def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1740,31 +1799,35 @@ class IntBase(NumberBase): return self._as_int @classmethod - def _validate_format(cls, arg: typing.Optional[decimal.Decimal], _instantiation_metadata: InstantiationMetadata): + def _validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata): if isinstance(arg, decimal.Decimal): exponent = arg.as_tuple().exponent if exponent != 0: raise ApiValueError( - "Invalid value '{}' for type integer at {}".format(arg, _instantiation_metadata.path_to_item) + "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item) ) @classmethod - def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _validate( + cls, + arg, + validation_metadata: ValidationMetadata, + ): """ IntBase _validate TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only """ - cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata) - return super()._validate(*args, _instantiation_metadata=_instantiation_metadata) + cls._validate_format(arg, validation_metadata=validation_metadata) + return super()._validate(arg, validation_metadata=validation_metadata) class IntSchema(IntBase, NumberSchema): @classmethod - def _from_openapi_data(cls, arg: int, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: int, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1815,9 +1878,9 @@ class Float32Schema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): # todo check format - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(arg, _configuration=_configuration) class Float64Base( @@ -1835,9 +1898,9 @@ class Float64Schema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): # todo check format - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + return super()._from_openapi_data(arg, _configuration=_configuration) class StrSchema( @@ -1853,28 +1916,28 @@ class StrSchema( """ @classmethod - def _from_openapi_data(cls, arg: typing.Union[str], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None) -> 'StrSchema': - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema': + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[str, date, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, date, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DateSchema(DateBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DateTimeSchema(DateTimeBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) class DecimalSchema(DecimalBase, StrSchema): - def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[ValidationMetadata]): """ Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads which can be simple (str) or complex (dicts or lists with nested values) @@ -1893,7 +1956,7 @@ class BytesSchema( """ this class will subclass bytes and is immutable """ - def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[ValidationMetadata]): return super(Schema, cls).__new__(cls, arg) @@ -1918,7 +1981,7 @@ class FileSchema( - to be able to preserve file name info """ - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[ValidationMetadata]): return super(Schema, cls).__new__(cls, arg) @@ -1953,7 +2016,7 @@ class BinarySchema( ], } - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg) @@ -1964,10 +2027,10 @@ class BoolSchema( ): @classmethod - def _from_openapi_data(cls, arg: bool, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: bool, _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: bool, **kwargs: typing.Union[InstantiationMetadata]): + def __new__(cls, arg: bool, **kwargs: typing.Union[ValidationMetadata]): return super().__new__(cls, arg, **kwargs) @@ -1993,10 +2056,10 @@ class DictSchema( ): @classmethod - def _from_openapi_data(cls, arg: typing.Dict[str, typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): - return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata) + def _from_openapi_data(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None): + return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, InstantiationMetadata]): + def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]): return super().__new__(cls, *args, **kwargs) diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py index 32a7f60d1caa..c628ddfb76dc 100644 --- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py +++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py @@ -12,7 +12,9 @@ from petstore_api.model.string_with_validation import StringWithValidation from petstore_api.model.string_enum import StringEnum from petstore_api.model.number_with_validations import NumberWithValidations from petstore_api.model.array_holding_any_type import ArrayHoldingAnyType -from petstore_api.model.array_with_validations_in_items import ArrayWithValidationsInItems +from petstore_api.model.array_with_validations_in_items import ( + ArrayWithValidationsInItems, +) from petstore_api.model.foo import Foo from petstore_api.model.animal import Animal from petstore_api.model.dog import Dog @@ -29,7 +31,7 @@ from petstore_api.schemas import ( StrSchema, NumberSchema, Schema, - InstantiationMetadata, + ValidationMetadata, Int64Schema, StrBase, NumberBase, @@ -38,140 +40,174 @@ from petstore_api.schemas import ( frozendict, ) -class TestValidateResults(unittest.TestCase): +class TestValidateResults(unittest.TestCase): def test_str_validate(self): - im = InstantiationMetadata() - path_to_schemas = StringWithValidation._validate('abcdefg', _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([StringWithValidation, str])} + vm = ValidationMetadata() + path_to_schemas = StringWithValidation._validate( + "abcdefg", validation_metadata=vm + ) + assert path_to_schemas == {("args[0]",): set([StringWithValidation, str])} def test_number_validate(self): - im = InstantiationMetadata() - path_to_schemas = NumberWithValidations._validate(Decimal(11), _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([NumberWithValidations, Decimal])} + vm = ValidationMetadata() + path_to_schemas = NumberWithValidations._validate( + Decimal(11), validation_metadata=vm + ) + assert path_to_schemas == {("args[0]",): set([NumberWithValidations, Decimal])} def test_str_enum_validate(self): - im = InstantiationMetadata() - path_to_schemas = StringEnum._validate('placed', _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([StringEnum])} + vm = ValidationMetadata() + path_to_schemas = StringEnum._validate("placed", validation_metadata=vm) + assert path_to_schemas == {("args[0]",): set([StringEnum])} def test_nullable_enum_validate(self): - im = InstantiationMetadata() - path_to_schemas = StringEnum._validate(None, _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([StringEnum])} + vm = ValidationMetadata() + path_to_schemas = StringEnum._validate(None, validation_metadata=vm) + assert path_to_schemas == {("args[0]",): set([StringEnum])} def test_empty_list_validate(self): - im = InstantiationMetadata() - path_to_schemas = ArrayHoldingAnyType._validate((), _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([ArrayHoldingAnyType, tuple])} + vm = ValidationMetadata() + path_to_schemas = ArrayHoldingAnyType._validate((), validation_metadata=vm) + assert path_to_schemas == {("args[0]",): set([ArrayHoldingAnyType, tuple])} def test_list_validate(self): - im = InstantiationMetadata() - path_to_schemas = ArrayHoldingAnyType._validate((Decimal(1), 'a'), _instantiation_metadata=im) + vm = ValidationMetadata() + path_to_schemas = ArrayHoldingAnyType._validate( + (Decimal(1), "a"), validation_metadata=vm + ) assert path_to_schemas == { - ('args[0]',): set([ArrayHoldingAnyType, tuple]), - ('args[0]', 0): set([AnyTypeSchema, Decimal]), - ('args[0]', 1): set([AnyTypeSchema, str]) + ("args[0]",): set([ArrayHoldingAnyType, tuple]), + ("args[0]", 0): set([AnyTypeSchema, Decimal]), + ("args[0]", 1): set([AnyTypeSchema, str]), } def test_empty_dict_validate(self): - im = InstantiationMetadata() - path_to_schemas = Foo._validate(frozendict({}), _instantiation_metadata=im) - assert path_to_schemas == {('args[0]',): set([Foo, frozendict])} + vm = ValidationMetadata() + path_to_schemas = Foo._validate(frozendict({}), validation_metadata=vm) + assert path_to_schemas == {("args[0]",): set([Foo, frozendict])} def test_dict_validate(self): - im = InstantiationMetadata() - path_to_schemas = Foo._validate(frozendict({'bar': 'a', 'additional': Decimal(0)}), _instantiation_metadata=im) + vm = ValidationMetadata() + path_to_schemas = Foo._validate( + frozendict({"bar": "a", "additional": Decimal(0)}), + validation_metadata=vm, + ) assert path_to_schemas == { - ('args[0]',): set([Foo, frozendict]), - ('args[0]', 'bar'): set([StrSchema, str]), - ('args[0]', 'additional'): set([AnyTypeSchema, Decimal]) + ("args[0]",): set([Foo, frozendict]), + ("args[0]", "bar"): set([StrSchema, str]), + ("args[0]", "additional"): set([AnyTypeSchema, Decimal]), } def test_discriminated_dict_validate(self): - im = InstantiationMetadata() - path_to_schemas = Animal._validate(frozendict(className='Dog', color='black'), _instantiation_metadata=im) + vm = ValidationMetadata() + path_to_schemas = Animal._validate( + frozendict(className="Dog", color="black"), validation_metadata=vm + ) assert path_to_schemas == { - ('args[0]',): set([Animal, Dog, DogAllOf, frozendict]), - ('args[0]', 'className'): set([StrSchema, AnyTypeSchema, str]), - ('args[0]', 'color'): set([StrSchema, AnyTypeSchema, str]), + ("args[0]",): set([Animal, Dog, DogAllOf, frozendict]), + ("args[0]", "className"): set([StrSchema, AnyTypeSchema, str]), + ("args[0]", "color"): set([StrSchema, AnyTypeSchema, str]), } def test_bool_enum_validate(self): - im = InstantiationMetadata() - path_to_schemas = BooleanEnum._validate(True, _instantiation_metadata=im) - assert path_to_schemas == { - ('args[0]',): set([BooleanEnum]) - } + vm = ValidationMetadata() + path_to_schemas = BooleanEnum._validate(True, validation_metadata=vm) + assert path_to_schemas == {("args[0]",): set([BooleanEnum])} def test_oneof_composition_pig_validate(self): - im = InstantiationMetadata() - path_to_schemas = Pig._validate(frozendict(className='DanishPig'), _instantiation_metadata=im) + vm = ValidationMetadata() + path_to_schemas = Pig._validate( + frozendict(className="DanishPig"), validation_metadata=vm + ) assert path_to_schemas == { - ('args[0]',): set([Pig, DanishPig, frozendict]), - ('args[0]', 'className'): set([DanishPig.className, AnyTypeSchema, str]), + ("args[0]",): set([Pig, DanishPig, frozendict]), + ("args[0]", "className"): set([DanishPig.className, AnyTypeSchema, str]), } def test_anyof_composition_gm_fruit_validate(self): - im = InstantiationMetadata() - path_to_schemas = GmFruit._validate(frozendict(cultivar='GoldenDelicious', lengthCm=Decimal(10)), _instantiation_metadata=im) + vm = ValidationMetadata() + path_to_schemas = GmFruit._validate( + frozendict(cultivar="GoldenDelicious", lengthCm=Decimal(10)), + validation_metadata=vm, + ) assert path_to_schemas == { - ('args[0]',): set([GmFruit, Apple, Banana, frozendict]), - ('args[0]', 'cultivar'): set([Apple.cultivar, AnyTypeSchema, str]), - ('args[0]', 'lengthCm'): set([AnyTypeSchema, NumberSchema, Decimal]), + ("args[0]",): set([GmFruit, Apple, Banana, frozendict]), + ("args[0]", "cultivar"): set([Apple.cultivar, AnyTypeSchema, str]), + ("args[0]", "lengthCm"): set([AnyTypeSchema, NumberSchema, Decimal]), } + class TestValidateCalls(unittest.TestCase): def test_empty_list_validate(self): - return_value = {('args[0]',): set([ArrayHoldingAnyType, tuple])} - with patch.object(Schema, '_validate', return_value=return_value) as mock_validate: - instance = ArrayHoldingAnyType([]) - assert mock_validate.call_count == 1 + return_value = {("args[0]",): set([ArrayHoldingAnyType, tuple])} + with patch.object( + Schema, "_validate", return_value=return_value + ) as mock_validate: + instance = ArrayHoldingAnyType([]) + assert mock_validate.call_count == 1 - with patch.object(Schema, '_validate', return_value=return_value) as mock_validate: - ArrayHoldingAnyType._from_openapi_data([]) - assert mock_validate.call_count == 1 + with patch.object( + Schema, "_validate", return_value=return_value + ) as mock_validate: + ArrayHoldingAnyType._from_openapi_data([]) + assert mock_validate.call_count == 1 def test_empty_dict_validate(self): - return_value = {('args[0]',): set([Foo, frozendict])} - with patch.object(Schema, '_validate', return_value=return_value) as mock_validate: - instance = Foo({}) - assert mock_validate.call_count == 1 + return_value = {("args[0]",): set([Foo, frozendict])} + with patch.object( + Schema, "_validate", return_value=return_value + ) as mock_validate: + instance = Foo({}) + assert mock_validate.call_count == 1 - with patch.object(Schema, '_validate', return_value=return_value) as mock_validate: - Foo._from_openapi_data({}) - assert mock_validate.call_count == 1 + with patch.object( + Schema, "_validate", return_value=return_value + ) as mock_validate: + Foo._from_openapi_data({}) + assert mock_validate.call_count == 1 def test_list_validate_direct_instantiation(self): expected_call_by_index = { 0: [ ArrayWithValidationsInItems, - ((Decimal('7'),),), - InstantiationMetadata(path_to_item=('args[0]',)) + ((Decimal("7"),),), + ValidationMetadata(path_to_item=("args[0]",)), ], 1: [ ArrayWithValidationsInItems._items, - (Decimal('7'),), - InstantiationMetadata(path_to_item=('args[0]', 0)) - ] + (Decimal("7"),), + ValidationMetadata(path_to_item=("args[0]", 0)), + ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([ArrayWithValidationsInItems, tuple]))] ), - 1: defaultdict(set, [( ('args[0]', 0), set([ArrayWithValidationsInItems._items, Decimal]) )] ), + 0: defaultdict( + set, [(("args[0]",), set([ArrayWithValidationsInItems, tuple]))] + ), + 1: defaultdict( + set, + [(("args[0]", 0), set([ArrayWithValidationsInItems._items, Decimal]))], + ), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result - with patch.object(Schema, '_validate', new=new_validate): + with patch.object(Schema, "_validate", new=new_validate): ArrayWithValidationsInItems([7]) def test_list_validate_direct_instantiation_cast_item(self): @@ -179,152 +215,191 @@ class TestValidateCalls(unittest.TestCase): expected_call_by_index = { 0: [ ArrayWithValidationsInItems, - ((Decimal('7'),),), - InstantiationMetadata(path_to_item=('args[0]',)) + ((Decimal("7"),),), + ValidationMetadata(path_to_item=("args[0]",)), ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([ArrayWithValidationsInItems, tuple]))] ), + 0: defaultdict( + set, [(("args[0]",), set([ArrayWithValidationsInItems, tuple]))] + ), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result item = ArrayWithValidationsInItems._items(7) - with patch.object(Schema, '_validate', new=new_validate): + with patch.object(Schema, "_validate", new=new_validate): ArrayWithValidationsInItems([item]) def test_list_validate_from_openai_data_instantiation(self): expected_call_by_index = { 0: [ ArrayWithValidationsInItems, - ((Decimal('7'),),), - InstantiationMetadata(path_to_item=('args[0]',), from_server=True) + ((Decimal("7"),),), + ValidationMetadata(path_to_item=("args[0]",), from_server=True), ], 1: [ ArrayWithValidationsInItems._items, - (Decimal('7'),), - InstantiationMetadata(path_to_item=('args[0]', 0), from_server=True) - ] + (Decimal("7"),), + ValidationMetadata(path_to_item=("args[0]", 0), from_server=True), + ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([ArrayWithValidationsInItems, tuple]))] ), - 1: defaultdict(set, [( ('args[0]', 0), set([ArrayWithValidationsInItems._items, Decimal]) )] ), + 0: defaultdict( + set, [(("args[0]",), set([ArrayWithValidationsInItems, tuple]))] + ), + 1: defaultdict( + set, + [(("args[0]", 0), set([ArrayWithValidationsInItems._items, Decimal]))], + ), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result - with patch.object(Schema, '_validate', new=new_validate): + with patch.object(Schema, "_validate", new=new_validate): ArrayWithValidationsInItems._from_openapi_data([7]) def test_dict_validate_direct_instantiation(self): expected_call_by_index = { 0: [ Foo, - (frozendict({'bar': 'a'}),), - InstantiationMetadata(path_to_item=('args[0]',)) + (frozendict({"bar": "a"}),), + ValidationMetadata(path_to_item=("args[0]",)), ], 1: [ StrSchema, - ('a',), - InstantiationMetadata(path_to_item=('args[0]', 'bar')) - ] + ("a",), + ValidationMetadata(path_to_item=("args[0]", "bar")), + ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([Foo, frozendict]))] ), - 1: defaultdict(set, [( ('args[0]', 'bar'), set([StrSchema, str]) )] ), + 0: defaultdict(set, [(("args[0]",), set([Foo, frozendict]))]), + 1: defaultdict(set, [(("args[0]", "bar"), set([StrSchema, str]))]), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result - with patch.object(Schema, '_validate', new=new_validate): - Foo(bar='a') + with patch.object(Schema, "_validate", new=new_validate): + Foo(bar="a") def test_dict_validate_direct_instantiation_cast_item(self): expected_call_by_index = { 0: [ Foo, - (frozendict({'bar': 'a'}),), - InstantiationMetadata(path_to_item=('args[0]',)) + (frozendict({"bar": "a"}),), + ValidationMetadata(path_to_item=("args[0]",)), ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([Foo, frozendict]))] ), + 0: defaultdict(set, [(("args[0]",), set([Foo, frozendict]))]), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result - bar = StrSchema('a') - with patch.object(Schema, '_validate', new=new_validate): + bar = StrSchema("a") + with patch.object(Schema, "_validate", new=new_validate): Foo(bar=bar) def test_dict_validate_from_openapi_data_instantiation(self): expected_call_by_index = { 0: [ Foo, - (frozendict({'bar': 'a'}),), - InstantiationMetadata(path_to_item=('args[0]',), from_server=True) + (frozendict({"bar": "a"}),), + ValidationMetadata(path_to_item=("args[0]",), from_server=True), ], 1: [ StrSchema, - ('a',), - InstantiationMetadata(path_to_item=('args[0]', 'bar'), from_server=True) - ] + ("a",), + ValidationMetadata( + path_to_item=("args[0]", "bar"), from_server=True + ), + ], } call_index = 0 result_by_call_index = { - 0: defaultdict(set, [( ('args[0]',), set([Foo, frozendict]))] ), - 1: defaultdict(set, [( ('args[0]', 'bar'), set([StrSchema, str]) )] ), + 0: defaultdict(set, [(("args[0]",), set([Foo, frozendict]))]), + 1: defaultdict(set, [(("args[0]", "bar"), set([StrSchema, str]))]), } @classmethod - def new_validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None): + def new_validate( + cls, + *args, + validation_metadata: typing.Optional[ValidationMetadata] = None, + ): nonlocal call_index - assert [cls, args, _instantiation_metadata] == expected_call_by_index[call_index] + assert [cls, args, validation_metadata] == expected_call_by_index[ + call_index + ] result = result_by_call_index.get(call_index) call_index += 1 if result is None: - raise petstore_api.ApiValueError('boom') + raise petstore_api.ApiValueError("boom") return result - with patch.object(Schema, '_validate', new=new_validate): - Foo._from_openapi_data({'bar': 'a'}) + with patch.object(Schema, "_validate", new=new_validate): + Foo._from_openapi_data({"bar": "a"}) -if __name__ == '__main__': +if __name__ == "__main__": unittest.main()