Fixes Python schema class order, Issue 276 (#277)

* Adds new components, adds possible java fix

* Fixes schema writing order

* Fixes python test

* Samples regen

Author: spacether

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/ref_in_allof.py

@@ -11,6 +11,11 @@
 from unit_test_api.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
 
+from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
+AllOf = typing.Tuple[
+    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
+]
+
 
 @dataclasses.dataclass(frozen=True)
 class RefInAllof(
@@ -24,8 +29,3 @@ class RefInAllof(
     # any type
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
 
-
-from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
-AllOf = typing.Tuple[
-    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
-]

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/ref_in_anyof.py

@@ -11,6 +11,11 @@
 from unit_test_api.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
 
+from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
+AnyOf = typing.Tuple[
+    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
+]
+
 
 @dataclasses.dataclass(frozen=True)
 class RefInAnyof(
@@ -24,8 +29,3 @@ class RefInAnyof(
     # any type
     any_of: AnyOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AnyOf)) # type: ignore
 
-
-from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
-AnyOf = typing.Tuple[
-    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
-]

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/ref_in_oneof.py

@@ -11,6 +11,11 @@
 from unit_test_api.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
 
+from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
+OneOf = typing.Tuple[
+    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
+]
+
 
 @dataclasses.dataclass(frozen=True)
 class RefInOneof(
@@ -24,8 +29,3 @@ class RefInOneof(
     # any type
     one_of: OneOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(OneOf)) # type: ignore
 
-
-from unit_test_api.components.schema import property_named_ref_that_is_not_a_reference
-OneOf = typing.Tuple[
-    typing.Type[property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference],
-]

samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/validation.py

@@ -840,8 +840,9 @@ def validate_any_of(
 ) -> PathToSchemasType:
     anyof_classes = []
     path_to_schemas: PathToSchemasType = collections.defaultdict(dict)
+    module_namespace = vars(sys.modules[cls.__module__])
     for schema in classes:
-        schema = _get_class(schema)
+        schema = _get_class(schema, module_namespace)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation

samples/client/3_1_0_unit_test/python/src/unit_test_api/schemas/validation.py

@@ -840,8 +840,9 @@ def validate_any_of(
 ) -> PathToSchemasType:
     anyof_classes = []
     path_to_schemas: PathToSchemasType = collections.defaultdict(dict)
+    module_namespace = vars(sys.modules[cls.__module__])
     for schema in classes:
-        schema = _get_class(schema)
+        schema = _get_class(schema, module_namespace)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation

samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/components/schema/operator.py

@@ -11,6 +11,13 @@
 from this_package.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
 
+from this_package.components.schema import addition_operator
+from this_package.components.schema import subtraction_operator
+OneOf = typing.Tuple[
+    typing.Type[addition_operator.AdditionOperator],
+    typing.Type[subtraction_operator.SubtractionOperator],
+]
+
 
 @dataclasses.dataclass(frozen=True)
 class Operator(
@@ -34,10 +41,3 @@ class Operator(
     )
     one_of: OneOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(OneOf)) # type: ignore
 
-
-from this_package.components.schema import addition_operator
-from this_package.components.schema import subtraction_operator
-OneOf = typing.Tuple[
-    typing.Type[addition_operator.AdditionOperator],
-    typing.Type[subtraction_operator.SubtractionOperator],
-]

samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/schemas/validation.py

@@ -888,8 +888,9 @@ def validate_any_of(
 ) -> PathToSchemasType:
     anyof_classes = []
     path_to_schemas: PathToSchemasType = collections.defaultdict(dict)
+    module_namespace = vars(sys.modules[cls.__module__])
     for schema in classes:
-        schema = _get_class(schema)
+        schema = _get_class(schema, module_namespace)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation

samples/client/openapi_features/security/python/src/this_package/schemas/validation.py

@@ -840,8 +840,9 @@ def validate_any_of(
 ) -> PathToSchemasType:
     anyof_classes = []
     path_to_schemas: PathToSchemasType = collections.defaultdict(dict)
+    module_namespace = vars(sys.modules[cls.__module__])
     for schema in classes:
-        schema = _get_class(schema)
+        schema = _get_class(schema, module_namespace)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation

samples/client/petstore/java/README.md

@@ -810,6 +810,10 @@ Class | Description
 
 
 
+[MyObjectDto](docs/MyObjectDto.md) |
+    
+
+    
 [Name](docs/Name.md) | Model for testing model name same as property name
 
 
@@ -906,6 +910,10 @@ Class | Description
 
 
 
+[PaginatedResultMyObjectDto](docs/PaginatedResultMyObjectDto.md) |
+    
+
+    
 [ParentPet](docs/ParentPet.md) |
 
 

samples/client/petstore/python/.openapi-generator/FILES

@@ -128,6 +128,7 @@ docs/components/schema/mammal.md
 docs/components/schema/map_test.md
 docs/components/schema/mixed_properties_and_additional_properties_class.md
 docs/components/schema/money.md
+docs/components/schema/my_object_dto.md
 docs/components/schema/name.md
 docs/components/schema/no_additional_properties.md
 docs/components/schema/nullable_class.md
@@ -152,6 +153,7 @@ docs/components/schema/object_with_only_optional_props.md
 docs/components/schema/object_with_optional_test_prop.md
 docs/components/schema/object_with_validations.md
 docs/components/schema/order.md
+docs/components/schema/paginated_result_my_object_dto.md
 docs/components/schema/parent_pet.md
 docs/components/schema/pet.md
 docs/components/schema/pig.md
@@ -636,6 +638,7 @@ src/petstore_api/components/schema/mammal.py
 src/petstore_api/components/schema/map_test.py
 src/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
 src/petstore_api/components/schema/money.py
+src/petstore_api/components/schema/my_object_dto.py
 src/petstore_api/components/schema/name.py
 src/petstore_api/components/schema/no_additional_properties.py
 src/petstore_api/components/schema/nullable_class.py
@@ -660,6 +663,7 @@ src/petstore_api/components/schema/object_with_only_optional_props.py
 src/petstore_api/components/schema/object_with_optional_test_prop.py
 src/petstore_api/components/schema/object_with_validations.py
 src/petstore_api/components/schema/order.py
+src/petstore_api/components/schema/paginated_result_my_object_dto.py
 src/petstore_api/components/schema/parent_pet.py
 src/petstore_api/components/schema/pet.py
 src/petstore_api/components/schema/pig.py