[python-pydantic-v1] various improvements (#16658)

* rename, add tests

* remove library support in python pydantic v1 codegen

* copy tests

* copy echo api tests

* update samples

* update doc

* add back library support

samples/openapi3/client/petstore/python-pydantic-v1/test/test_additional_properties_any_type.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAdditionalPropertiesAnyType(unittest.TestCase):
     """AdditionalPropertiesAnyType unit test stubs"""
@@ -26,19 +28,19 @@ class TestAdditionalPropertiesAnyType(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AdditionalPropertiesAnyType:
+    def make_instance(self, include_optional):
         """Test AdditionalPropertiesAnyType
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesAnyType`
         """
-        model = AdditionalPropertiesAnyType()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.additional_properties_any_type.AdditionalPropertiesAnyType()  # noqa: E501
+        if include_optional :
             return AdditionalPropertiesAnyType(
                 name = ''
             )
-        else:
+        else :
             return AdditionalPropertiesAnyType(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_additional_properties_class.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAdditionalPropertiesClass(unittest.TestCase):
     """AdditionalPropertiesClass unit test stubs"""
@@ -26,26 +28,26 @@ class TestAdditionalPropertiesClass(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AdditionalPropertiesClass:
+    def make_instance(self, include_optional):
         """Test AdditionalPropertiesClass
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesClass`
         """
-        model = AdditionalPropertiesClass()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.additional_properties_class.AdditionalPropertiesClass()  # noqa: E501
+        if include_optional :
             return AdditionalPropertiesClass(
                 map_property = {
                     'key' : ''
-                    },
+                    }, 
                 map_of_map_property = {
                     'key' : {
                         'key' : ''
                         }
                     }
             )
-        else:
+        else :
             return AdditionalPropertiesClass(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_additional_properties_object.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.additional_properties_object import AdditionalPropertiesObject  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAdditionalPropertiesObject(unittest.TestCase):
     """AdditionalPropertiesObject unit test stubs"""
@@ -26,19 +28,19 @@ class TestAdditionalPropertiesObject(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AdditionalPropertiesObject:
+    def make_instance(self, include_optional):
         """Test AdditionalPropertiesObject
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesObject`
         """
-        model = AdditionalPropertiesObject()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.additional_properties_object.AdditionalPropertiesObject()  # noqa: E501
+        if include_optional :
             return AdditionalPropertiesObject(
                 name = ''
             )
-        else:
+        else :
             return AdditionalPropertiesObject(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_additional_properties_with_description_only.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.additional_properties_with_description_only import AdditionalPropertiesWithDescriptionOnly  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAdditionalPropertiesWithDescriptionOnly(unittest.TestCase):
     """AdditionalPropertiesWithDescriptionOnly unit test stubs"""
@@ -26,19 +28,19 @@ class TestAdditionalPropertiesWithDescriptionOnly(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AdditionalPropertiesWithDescriptionOnly:
+    def make_instance(self, include_optional):
         """Test AdditionalPropertiesWithDescriptionOnly
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesWithDescriptionOnly`
         """
-        model = AdditionalPropertiesWithDescriptionOnly()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.additional_properties_with_description_only.AdditionalPropertiesWithDescriptionOnly()  # noqa: E501
+        if include_optional :
             return AdditionalPropertiesWithDescriptionOnly(
                 name = ''
             )
-        else:
+        else :
             return AdditionalPropertiesWithDescriptionOnly(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_all_of_with_single_ref.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAllOfWithSingleRef(unittest.TestCase):
     """AllOfWithSingleRef unit test stubs"""
@@ -26,28 +28,25 @@ class TestAllOfWithSingleRef(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AllOfWithSingleRef:
+    def make_instance(self, include_optional):
         """Test AllOfWithSingleRef
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `AllOfWithSingleRef`
-        """
-        model = AllOfWithSingleRef()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.all_of_with_single_ref.AllOfWithSingleRef()  # noqa: E501
+        if include_optional :
             return AllOfWithSingleRef(
-                username = '',
-                single_ref_type = 'admin'
+                username = '', 
+                single_ref_type = None
             )
-        else:
+        else :
             return AllOfWithSingleRef(
         )
-        """
 
     def testAllOfWithSingleRef(self):
         """Test AllOfWithSingleRef"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_animal.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.animal import Animal  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAnimal(unittest.TestCase):
     """Animal unit test stubs"""
@@ -26,29 +28,26 @@ class TestAnimal(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Animal:
+    def make_instance(self, include_optional):
         """Test Animal
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Animal`
-        """
-        model = Animal()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.animal.Animal()  # noqa: E501
+        if include_optional :
             return Animal(
-                class_name = '',
+                class_name = '', 
                 color = 'red'
             )
-        else:
+        else :
             return Animal(
                 class_name = '',
         )
-        """
 
     def testAnimal(self):
         """Test Animal"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_another_fake_api.py

@@ -3,30 +3,32 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
+import petstore_api
 from petstore_api.api.another_fake_api import AnotherFakeApi  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestAnotherFakeApi(unittest.TestCase):
     """AnotherFakeApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = AnotherFakeApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.another_fake_api.AnotherFakeApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_call_123_test_special_tags(self) -> None:
+    def test_call_123_test_special_tags(self):
         """Test case for call_123_test_special_tags
 
         To test special tags  # noqa: E501

samples/openapi3/client/petstore/python-pydantic-v1/test/test_any_of_color.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.any_of_color import AnyOfColor  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAnyOfColor(unittest.TestCase):
     """AnyOfColor unit test stubs"""
@@ -26,18 +28,18 @@ class TestAnyOfColor(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AnyOfColor:
+    def make_instance(self, include_optional):
         """Test AnyOfColor
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AnyOfColor`
         """
-        model = AnyOfColor()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.any_of_color.AnyOfColor()  # noqa: E501
+        if include_optional :
             return AnyOfColor(
             )
-        else:
+        else :
             return AnyOfColor(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_any_of_pig.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.any_of_pig import AnyOfPig  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestAnyOfPig(unittest.TestCase):
     """AnyOfPig unit test stubs"""
@@ -26,28 +28,6 @@ class TestAnyOfPig(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> AnyOfPig:
-        """Test AnyOfPig
-            include_option is a boolean, when False only required
-            params are included, when True both required and
-            optional params are included """
-        # uncomment below to create an instance of `AnyOfPig`
-        """
-        model = AnyOfPig()  # noqa: E501
-        if include_optional:
-            return AnyOfPig(
-                class_name = '',
-                color = '',
-                size = 56
-            )
-        else:
-            return AnyOfPig(
-                class_name = '',
-                color = '',
-                size = 56,
-        )
-        """
-
     def testAnyOfPig(self):
         """Test AnyOfPig"""
         # inst_req_only = self.make_instance(include_optional=False)

samples/openapi3/client/petstore/python-pydantic-v1/test/test_api_response.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.api_response import ApiResponse  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestApiResponse(unittest.TestCase):
     """ApiResponse unit test stubs"""
@@ -26,29 +28,26 @@ class TestApiResponse(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ApiResponse:
+    def make_instance(self, include_optional):
         """Test ApiResponse
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ApiResponse`
-        """
-        model = ApiResponse()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.api_response.ApiResponse()  # noqa: E501
+        if include_optional :
             return ApiResponse(
-                code = 56,
-                type = '',
+                code = 56, 
+                type = '', 
                 message = ''
             )
-        else:
+        else :
             return ApiResponse(
         )
-        """
 
     def testApiResponse(self):
         """Test ApiResponse"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_array_of_array_of_model.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.array_of_array_of_model import ArrayOfArrayOfModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestArrayOfArrayOfModel(unittest.TestCase):
     """ArrayOfArrayOfModel unit test stubs"""
@@ -26,17 +28,17 @@ class TestArrayOfArrayOfModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ArrayOfArrayOfModel:
+    def make_instance(self, include_optional):
         """Test ArrayOfArrayOfModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `ArrayOfArrayOfModel`
         """
-        model = ArrayOfArrayOfModel()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.array_of_array_of_model.ArrayOfArrayOfModel()  # noqa: E501
+        if include_optional :
             return ArrayOfArrayOfModel(
-                another_property = [
+                shop_id_to_org_online_lip_map = [
                     [
                         petstore_api.models.tag.Tag(
                             id = 56, 
@@ -44,7 +46,7 @@ class TestArrayOfArrayOfModel(unittest.TestCase):
                         ]
                     ]
             )
-        else:
+        else :
             return ArrayOfArrayOfModel(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_array_of_array_of_number_only.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestArrayOfArrayOfNumberOnly(unittest.TestCase):
     """ArrayOfArrayOfNumberOnly unit test stubs"""
@@ -26,15 +28,13 @@ class TestArrayOfArrayOfNumberOnly(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ArrayOfArrayOfNumberOnly:
+    def make_instance(self, include_optional):
         """Test ArrayOfArrayOfNumberOnly
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ArrayOfArrayOfNumberOnly`
-        """
-        model = ArrayOfArrayOfNumberOnly()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.array_of_array_of_number_only.ArrayOfArrayOfNumberOnly()  # noqa: E501
+        if include_optional :
             return ArrayOfArrayOfNumberOnly(
                 array_array_number = [
                     [
@@ -42,15 +42,14 @@ class TestArrayOfArrayOfNumberOnly(unittest.TestCase):
                         ]
                     ]
             )
-        else:
+        else :
             return ArrayOfArrayOfNumberOnly(
         )
-        """
 
     def testArrayOfArrayOfNumberOnly(self):
         """Test ArrayOfArrayOfNumberOnly"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_array_of_number_only.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestArrayOfNumberOnly(unittest.TestCase):
     """ArrayOfNumberOnly unit test stubs"""
@@ -26,29 +28,26 @@ class TestArrayOfNumberOnly(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ArrayOfNumberOnly:
+    def make_instance(self, include_optional):
         """Test ArrayOfNumberOnly
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ArrayOfNumberOnly`
-        """
-        model = ArrayOfNumberOnly()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.array_of_number_only.ArrayOfNumberOnly()  # noqa: E501
+        if include_optional :
             return ArrayOfNumberOnly(
                 array_number = [
                     1.337
                     ]
             )
-        else:
+        else :
             return ArrayOfNumberOnly(
         )
-        """
 
     def testArrayOfNumberOnly(self):
         """Test ArrayOfNumberOnly"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_array_test.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.array_test import ArrayTest  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestArrayTest(unittest.TestCase):
     """ArrayTest unit test stubs"""
@@ -26,24 +28,22 @@ class TestArrayTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ArrayTest:
+    def make_instance(self, include_optional):
         """Test ArrayTest
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ArrayTest`
-        """
-        model = ArrayTest()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.array_test.ArrayTest()  # noqa: E501
+        if include_optional :
             return ArrayTest(
                 array_of_string = [
                     ''
-                    ],
+                    ], 
                 array_array_of_integer = [
                     [
                         56
                         ]
-                    ],
+                    ], 
                 array_array_of_model = [
                     [
                         petstore_api.models.read_only_first.ReadOnlyFirst(
@@ -52,15 +52,14 @@ class TestArrayTest(unittest.TestCase):
                         ]
                     ]
             )
-        else:
+        else :
             return ArrayTest(
         )
-        """
 
     def testArrayTest(self):
         """Test ArrayTest"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_basque_pig.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.basque_pig import BasquePig  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestBasquePig(unittest.TestCase):
     """BasquePig unit test stubs"""
@@ -26,30 +28,27 @@ class TestBasquePig(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> BasquePig:
+    def make_instance(self, include_optional):
         """Test BasquePig
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `BasquePig`
-        """
-        model = BasquePig()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.basque_pig.BasquePig()  # noqa: E501
+        if include_optional :
             return BasquePig(
-                class_name = '',
+                class_name = '', 
                 color = ''
             )
-        else:
+        else :
             return BasquePig(
                 class_name = '',
                 color = '',
         )
-        """
 
     def testBasquePig(self):
         """Test BasquePig"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_capitalization.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.capitalization import Capitalization  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCapitalization(unittest.TestCase):
     """Capitalization unit test stubs"""
@@ -26,32 +28,29 @@ class TestCapitalization(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Capitalization:
+    def make_instance(self, include_optional):
         """Test Capitalization
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Capitalization`
-        """
-        model = Capitalization()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.capitalization.Capitalization()  # noqa: E501
+        if include_optional :
             return Capitalization(
-                small_camel = '',
-                capital_camel = '',
-                small_snake = '',
-                capital_snake = '',
-                sca_eth_flow_points = '',
+                small_camel = '', 
+                capital_camel = '', 
+                small_snake = '', 
+                capital_snake = '', 
+                sca_eth_flow_points = '', 
                 att_name = ''
             )
-        else:
+        else :
             return Capitalization(
         )
-        """
 
     def testCapitalization(self):
         """Test Capitalization"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_cat.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.cat import Cat  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCat(unittest.TestCase):
     """Cat unit test stubs"""
@@ -26,23 +28,6 @@ class TestCat(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Cat:
-        """Test Cat
-            include_option is a boolean, when False only required
-            params are included, when True both required and
-            optional params are included """
-        # uncomment below to create an instance of `Cat`
-        """
-        model = Cat()  # noqa: E501
-        if include_optional:
-            return Cat(
-                declawed = True
-            )
-        else:
-            return Cat(
-        )
-        """
-
     def testCat(self):
         """Test Cat"""
         # inst_req_only = self.make_instance(include_optional=False)

samples/openapi3/client/petstore/python-pydantic-v1/test/test_category.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.category import Category  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCategory(unittest.TestCase):
     """Category unit test stubs"""
@@ -26,24 +28,21 @@ class TestCategory(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Category:
+    def make_instance(self, include_optional):
         """Test Category
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Category`
-        """
-        model = Category()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.category.Category()  # noqa: E501
+        if include_optional :
             return Category(
-                id = 56,
+                id = 56, 
                 name = 'default-name'
             )
-        else:
+        else :
             return Category(
                 name = 'default-name',
         )
-        """
 
     def testCategory(self):
         """Test Category"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_circular_reference_model.py

@@ -3,19 +3,23 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
+from __future__ import absolute_import
+
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.circular_reference_model import CircularReferenceModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCircularReferenceModel(unittest.TestCase):
     """CircularReferenceModel unit test stubs"""
@@ -26,17 +30,17 @@ class TestCircularReferenceModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> CircularReferenceModel:
+    def make_instance(self, include_optional):
         """Test CircularReferenceModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `CircularReferenceModel`
         """
-        model = CircularReferenceModel()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.circular_reference_model.CircularReferenceModel()  # noqa: E501
+        if include_optional :
             return CircularReferenceModel(
-                size = 56,
+                size = 56, 
                 nested = petstore_api.models.first_ref.FirstRef(
                     category = '', 
                     self_ref = petstore_api.models.second_ref.SecondRef(
@@ -46,7 +50,7 @@ class TestCircularReferenceModel(unittest.TestCase):
                             nested = petstore_api.models.first_ref.FirstRef(
                                 category = '', ), ), ), )
             )
-        else:
+        else :
             return CircularReferenceModel(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_class_model.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.class_model import ClassModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestClassModel(unittest.TestCase):
     """ClassModel unit test stubs"""
@@ -26,27 +28,24 @@ class TestClassModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ClassModel:
+    def make_instance(self, include_optional):
         """Test ClassModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ClassModel`
-        """
-        model = ClassModel()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.class_model.ClassModel()  # noqa: E501
+        if include_optional :
             return ClassModel(
-                var_class = ''
+                _class = ''
             )
-        else:
+        else :
             return ClassModel(
         )
-        """
 
     def testClassModel(self):
         """Test ClassModel"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_client.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.client import Client  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestClient(unittest.TestCase):
     """Client unit test stubs"""
@@ -26,27 +28,24 @@ class TestClient(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Client:
+    def make_instance(self, include_optional):
         """Test Client
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Client`
-        """
-        model = Client()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.client.Client()  # noqa: E501
+        if include_optional :
             return Client(
                 client = ''
             )
-        else:
+        else :
             return Client(
         )
-        """
 
     def testClient(self):
         """Test Client"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_color.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.color import Color  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestColor(unittest.TestCase):
     """Color unit test stubs"""
@@ -26,18 +28,18 @@ class TestColor(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Color:
+    def make_instance(self, include_optional):
         """Test Color
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `Color`
         """
-        model = Color()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.color.Color()  # noqa: E501
+        if include_optional :
             return Color(
             )
-        else:
+        else :
             return Color(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_configuration.py

@@ -0,0 +1,54 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    OpenAPI spec version: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import petstore_api
+from petstore_api import Configuration # noqa: E501
+from petstore_api.rest import ApiException
+
+
+class TestConfiguration(unittest.TestCase):
+    """Configuration unit test stubs"""
+
+    def setUp(self):
+        self.config= Configuration()
+
+    def tearDown(self):
+        pass
+
+    def test_configuration(self):
+        """Test configuration
+
+        Test host settings # noqa: E501
+        """
+        host_settings = self.config.get_host_settings()
+
+        self.assertEqual('http://{server}.swagger.io:{port}/v2', host_settings[0]['url'])
+        self.assertEqual('petstore', host_settings[0]['variables']['server']['default_value'])
+
+        self.assertEqual('https://localhost:8080/{version}', host_settings[1]['url'])
+        self.assertEqual('v2', host_settings[1]['variables']['version']['default_value'])
+
+    def test_get_host_from_settings(self):
+        """ Test get_host_from_settings
+
+        Test get URL from host settings
+        """
+        self.assertEqual("http://petstore.swagger.io:80/v2", self.config.get_host_from_settings(0))
+        self.assertEqual("http://petstore.swagger.io:8080/v2", self.config.get_host_from_settings(0, {'port': '8080'}))
+        self.assertEqual("http://dev-petstore.swagger.io:8080/v2", self.config.get_host_from_settings(0, {'server': 'dev-petstore', 'port': '8080'}))
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_creature.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.creature import Creature  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCreature(unittest.TestCase):
     """Creature unit test stubs"""
@@ -26,21 +28,21 @@ class TestCreature(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Creature:
+    def make_instance(self, include_optional):
         """Test Creature
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `Creature`
         """
-        model = Creature()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.creature.Creature()  # noqa: E501
+        if include_optional :
             return Creature(
                 info = petstore_api.models.creature_info.CreatureInfo(
-                    name = '', ),
+                    name = '', ), 
                 type = ''
             )
-        else:
+        else :
             return Creature(
                 info = petstore_api.models.creature_info.CreatureInfo(
                     name = '', ),

samples/openapi3/client/petstore/python-pydantic-v1/test/test_creature_info.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.creature_info import CreatureInfo  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestCreatureInfo(unittest.TestCase):
     """CreatureInfo unit test stubs"""
@@ -26,19 +28,19 @@ class TestCreatureInfo(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> CreatureInfo:
+    def make_instance(self, include_optional):
         """Test CreatureInfo
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `CreatureInfo`
         """
-        model = CreatureInfo()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.creature_info.CreatureInfo()  # noqa: E501
+        if include_optional :
             return CreatureInfo(
                 name = ''
             )
-        else:
+        else :
             return CreatureInfo(
                 name = '',
         )

samples/openapi3/client/petstore/python-pydantic-v1/test/test_danish_pig.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.danish_pig import DanishPig  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestDanishPig(unittest.TestCase):
     """DanishPig unit test stubs"""
@@ -26,30 +28,27 @@ class TestDanishPig(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> DanishPig:
+    def make_instance(self, include_optional):
         """Test DanishPig
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `DanishPig`
-        """
-        model = DanishPig()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.danish_pig.DanishPig()  # noqa: E501
+        if include_optional :
             return DanishPig(
-                class_name = '',
+                class_name = '', 
                 size = 56
             )
-        else:
+        else :
             return DanishPig(
                 class_name = '',
                 size = 56,
         )
-        """
 
     def testDanishPig(self):
         """Test DanishPig"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_default_api.py

@@ -3,30 +3,32 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
+import petstore_api
 from petstore_api.api.default_api import DefaultApi  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestDefaultApi(unittest.TestCase):
     """DefaultApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = DefaultApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.default_api.DefaultApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_foo_get(self) -> None:
+    def test_foo_get(self):
         """Test case for foo_get
 
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_deprecated_object.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.deprecated_object import DeprecatedObject  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestDeprecatedObject(unittest.TestCase):
     """DeprecatedObject unit test stubs"""
@@ -26,27 +28,24 @@ class TestDeprecatedObject(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> DeprecatedObject:
+    def make_instance(self, include_optional):
         """Test DeprecatedObject
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `DeprecatedObject`
-        """
-        model = DeprecatedObject()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.deprecated_object.DeprecatedObject()  # noqa: E501
+        if include_optional :
             return DeprecatedObject(
                 name = ''
             )
-        else:
+        else :
             return DeprecatedObject(
         )
-        """
 
     def testDeprecatedObject(self):
         """Test DeprecatedObject"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_dog.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.dog import Dog  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestDog(unittest.TestCase):
     """Dog unit test stubs"""
@@ -26,23 +28,6 @@ class TestDog(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Dog:
-        """Test Dog
-            include_option is a boolean, when False only required
-            params are included, when True both required and
-            optional params are included """
-        # uncomment below to create an instance of `Dog`
-        """
-        model = Dog()  # noqa: E501
-        if include_optional:
-            return Dog(
-                breed = ''
-            )
-        else:
-            return Dog(
-        )
-        """
-
     def testDog(self):
         """Test Dog"""
         # inst_req_only = self.make_instance(include_optional=False)

samples/openapi3/client/petstore/python-pydantic-v1/test/test_dummy_model.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.dummy_model import DummyModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestDummyModel(unittest.TestCase):
     """DummyModel unit test stubs"""
@@ -26,23 +28,23 @@ class TestDummyModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> DummyModel:
+    def make_instance(self, include_optional):
         """Test DummyModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `DummyModel`
         """
-        model = DummyModel()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.dummy_model.DummyModel()  # noqa: E501
+        if include_optional :
             return DummyModel(
-                category = '',
+                category = '', 
                 self_ref = petstore_api.models.self_reference_model.Self-Reference-Model(
                     size = 56, 
                     nested = petstore_api.models.dummy_model.Dummy-Model(
                         category = '', ), )
             )
-        else:
+        else :
             return DummyModel(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_enum_arrays.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.enum_arrays import EnumArrays  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestEnumArrays(unittest.TestCase):
     """EnumArrays unit test stubs"""
@@ -26,25 +28,22 @@ class TestEnumArrays(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> EnumArrays:
+    def make_instance(self, include_optional):
         """Test EnumArrays
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `EnumArrays`
-        """
-        model = EnumArrays()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.enum_arrays.EnumArrays()  # noqa: E501
+        if include_optional :
             return EnumArrays(
-                just_symbol = '>=',
+                just_symbol = '>=', 
                 array_enum = [
                     'fish'
                     ]
             )
-        else:
+        else :
             return EnumArrays(
         )
-        """
 
     def testEnumArrays(self):
         """Test EnumArrays"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_enum_class.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.enum_class import EnumClass  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestEnumClass(unittest.TestCase):
     """EnumClass unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_enum_string1.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.enum_string1 import EnumString1  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestEnumString1(unittest.TestCase):
     """EnumString1 unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_enum_string2.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.enum_string2 import EnumString2  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestEnumString2(unittest.TestCase):
     """EnumString2 unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_enum_test.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.enum_test import EnumTest  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestEnumTest(unittest.TestCase):
     """EnumTest unit test stubs"""
@@ -26,31 +28,27 @@ class TestEnumTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> EnumTest:
+    def make_instance(self, include_optional):
         """Test EnumTest
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `EnumTest`
-        """
-        model = EnumTest()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.enum_test.EnumTest()  # noqa: E501
+        if include_optional :
             return EnumTest(
-                enum_string = 'UPPER',
-                enum_string_required = 'UPPER',
-                enum_integer_default = 1,
-                enum_integer = 1,
-                enum_number = 1.1,
-                outer_enum = 'placed',
-                outer_enum_integer = 2,
-                outer_enum_default_value = 'placed',
-                outer_enum_integer_default_value = -1
+                enum_string = 'UPPER', 
+                enum_string_required = 'UPPER', 
+                enum_integer = 1, 
+                enum_number = 1.1, 
+                outer_enum = 'placed', 
+                outer_enum_integer = 2, 
+                outer_enum_default_value = 'placed', 
+                outer_enum_integer_default_value = 0
             )
-        else:
+        else :
             return EnumTest(
                 enum_string_required = 'UPPER',
         )
-        """
 
     def testEnumTest(self):
         """Test EnumTest"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_fake_api.py

@@ -3,173 +3,144 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 
+import petstore_api
 from petstore_api.api.fake_api import FakeApi  # noqa: E501
 
 
 class TestFakeApi(unittest.TestCase):
     """FakeApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = FakeApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.fake_api.FakeApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_fake_any_type_request_body(self) -> None:
-        """Test case for fake_any_type_request_body
-
-        test any type request body  # noqa: E501
-        """
-        pass
-
-    def test_fake_enum_ref_query_parameter(self) -> None:
-        """Test case for fake_enum_ref_query_parameter
-
-        test enum reference query parameter  # noqa: E501
-        """
-        pass
-
-    def test_fake_health_get(self) -> None:
+    def test_fake_health_get(self):
         """Test case for fake_health_get
 
         Health check endpoint  # noqa: E501
         """
         pass
 
-    def test_fake_http_signature_test(self) -> None:
+    def test_fake_http_signature_test(self):
         """Test case for fake_http_signature_test
 
         test http signature authentication  # noqa: E501
         """
         pass
 
-    def test_fake_outer_boolean_serialize(self) -> None:
+    def test_fake_outer_boolean_serialize(self):
         """Test case for fake_outer_boolean_serialize
 
         """
         pass
 
-    def test_fake_outer_composite_serialize(self) -> None:
+    def test_fake_outer_composite_serialize(self):
         """Test case for fake_outer_composite_serialize
 
         """
         pass
 
-    def test_fake_outer_number_serialize(self) -> None:
+    def test_fake_outer_number_serialize(self):
         """Test case for fake_outer_number_serialize
 
         """
         pass
 
-    def test_fake_outer_string_serialize(self) -> None:
+    def test_fake_outer_string_serialize(self):
         """Test case for fake_outer_string_serialize
 
         """
         pass
 
-    def test_fake_property_enum_integer_serialize(self) -> None:
-        """Test case for fake_property_enum_integer_serialize
-
-        """
-        pass
-
-    def test_fake_return_list_of_objects(self) -> None:
-        """Test case for fake_return_list_of_objects
-
-        test returning list of objects  # noqa: E501
-        """
-        pass
-
-    def test_fake_uuid_example(self) -> None:
-        """Test case for fake_uuid_example
-
-        test uuid example  # noqa: E501
-        """
-        pass
-
-    def test_test_body_with_binary(self) -> None:
-        """Test case for test_body_with_binary
-
-        """
-        pass
-
-    def test_test_body_with_file_schema(self) -> None:
+    def test_test_body_with_file_schema(self):
         """Test case for test_body_with_file_schema
 
         """
         pass
 
-    def test_test_body_with_query_params(self) -> None:
+    def test_test_body_with_query_params(self):
         """Test case for test_body_with_query_params
 
         """
         pass
 
-    def test_test_client_model(self) -> None:
+    def test_test_client_model(self):
         """Test case for test_client_model
 
         To test \"client\" model  # noqa: E501
         """
         pass
 
-    def test_test_date_time_query_parameter(self) -> None:
-        """Test case for test_date_time_query_parameter
-
-        """
-        pass
-
-    def test_test_endpoint_parameters(self) -> None:
+    def test_test_endpoint_parameters(self):
         """Test case for test_endpoint_parameters
 
         Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
         """
         pass
 
-    def test_test_group_parameters(self) -> None:
+    def test_test_enum_parameters(self):
+        """Test case for test_enum_parameters
+
+        To test enum parameters  # noqa: E501
+        """
+        pass
+
+    def test_test_group_parameters(self):
         """Test case for test_group_parameters
 
         Fake endpoint to test group parameters (optional)  # noqa: E501
         """
         pass
 
-    def test_test_inline_additional_properties(self) -> None:
+    def test_test_inline_additional_properties(self):
         """Test case for test_inline_additional_properties
 
         test inline additionalProperties  # noqa: E501
         """
         pass
 
-    def test_test_inline_freeform_additional_properties(self) -> None:
-        """Test case for test_inline_freeform_additional_properties
-
-        test inline free-form additionalProperties  # noqa: E501
-        """
-        pass
-
-    def test_test_json_form_data(self) -> None:
+    def test_test_json_form_data(self):
         """Test case for test_json_form_data
 
         test json serialization of form data  # noqa: E501
         """
         pass
 
-    def test_test_query_parameter_collection_format(self) -> None:
+    def test_test_query_parameter_collection_format(self):
         """Test case for test_query_parameter_collection_format
 
         """
         pass
 
+    def test_headers_parameter(self):
+        """Test case for the _headers are passed by the user
+
+        To test any optional parameter  # noqa: E501
+        """
+        api = petstore_api.api.PetApi()
+        with patch("petstore_api.api_client.ApiClient.call_api") as mock_method:
+            value_headers = {"Header1": "value1"}
+            api.find_pets_by_status(["available"], _headers=value_headers)
+            args, _ = mock_method.call_args
+            self.assertEqual(args, ('/pet/findByStatus', 'GET', {}, [('status', ['available'])], {'Accept': 'application/json', 'Header1': 'value1'})
+)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_fake_classname_tags123_api.py

@@ -3,30 +3,32 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
-from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api  # noqa: E501
+import petstore_api
+from petstore_api.api.fake_classname_tags_123_api import FakeClassnameTags123Api  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestFakeClassnameTags123Api(unittest.TestCase):
     """FakeClassnameTags123Api unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = FakeClassnameTags123Api()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.fake_classname_tags_123_api.FakeClassnameTags123Api()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_test_classname(self) -> None:
+    def test_test_classname(self):
         """Test case for test_classname
 
         To test class name in snake case  # noqa: E501

samples/openapi3/client/petstore/python-pydantic-v1/test/test_fake_classname_tags_123_api.py

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import petstore_api
+from petstore_api.api.fake_classname_tags_123_api import FakeClassnameTags123Api  # noqa: E501
+from petstore_api.rest import ApiException
+
+
+class TestFakeClassnameTags123Api(unittest.TestCase):
+    """FakeClassnameTags123Api unit test stubs"""
+
+    def setUp(self):
+        self.api = petstore_api.api.fake_classname_tags_123_api.FakeClassnameTags123Api()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_test_classname(self):
+        """Test case for test_classname
+
+        To test class name in snake case  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_file.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.file import File  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFile(unittest.TestCase):
     """File unit test stubs"""
@@ -26,27 +28,24 @@ class TestFile(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> File:
+    def make_instance(self, include_optional):
         """Test File
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `File`
-        """
-        model = File()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.file.File()  # noqa: E501
+        if include_optional :
             return File(
                 source_uri = ''
             )
-        else:
+        else :
             return File(
         )
-        """
 
     def testFile(self):
         """Test File"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_file_schema_test_class.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.file_schema_test_class import FileSchemaTestClass  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFileSchemaTestClass(unittest.TestCase):
     """FileSchemaTestClass unit test stubs"""
@@ -26,32 +28,29 @@ class TestFileSchemaTestClass(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> FileSchemaTestClass:
+    def make_instance(self, include_optional):
         """Test FileSchemaTestClass
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `FileSchemaTestClass`
-        """
-        model = FileSchemaTestClass()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.file_schema_test_class.FileSchemaTestClass()  # noqa: E501
+        if include_optional :
             return FileSchemaTestClass(
                 file = petstore_api.models.file.File(
-                    source_uri = '', ),
+                    source_uri = '', ), 
                 files = [
                     petstore_api.models.file.File(
                         source_uri = '', )
                     ]
             )
-        else:
+        else :
             return FileSchemaTestClass(
         )
-        """
 
     def testFileSchemaTestClass(self):
         """Test FileSchemaTestClass"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_first_ref.py

@@ -3,19 +3,23 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
+from __future__ import absolute_import
+
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.first_ref import FirstRef  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFirstRef(unittest.TestCase):
     """FirstRef unit test stubs"""
@@ -26,17 +30,17 @@ class TestFirstRef(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> FirstRef:
+    def make_instance(self, include_optional):
         """Test FirstRef
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `FirstRef`
         """
-        model = FirstRef()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.first_ref.FirstRef()  # noqa: E501
+        if include_optional :
             return FirstRef(
-                category = '',
+                category = '', 
                 self_ref = petstore_api.models.second_ref.SecondRef(
                     category = '', 
                     circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model(
@@ -44,7 +48,7 @@ class TestFirstRef(unittest.TestCase):
                         nested = petstore_api.models.first_ref.FirstRef(
                             category = '', ), ), )
             )
-        else:
+        else :
             return FirstRef(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_foo.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.foo import Foo  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFoo(unittest.TestCase):
     """Foo unit test stubs"""
@@ -26,27 +28,24 @@ class TestFoo(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Foo:
+    def make_instance(self, include_optional):
         """Test Foo
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Foo`
-        """
-        model = Foo()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.foo.Foo()  # noqa: E501
+        if include_optional :
             return Foo(
                 bar = 'bar'
             )
-        else:
+        else :
             return Foo(
         )
-        """
 
     def testFoo(self):
         """Test Foo"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_foo_get_default_response.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.foo_get_default_response import FooGetDefaultResponse  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFooGetDefaultResponse(unittest.TestCase):
     """FooGetDefaultResponse unit test stubs"""
@@ -26,28 +28,25 @@ class TestFooGetDefaultResponse(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> FooGetDefaultResponse:
+    def make_instance(self, include_optional):
         """Test FooGetDefaultResponse
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `FooGetDefaultResponse`
-        """
-        model = FooGetDefaultResponse()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.foo_get_default_response.FooGetDefaultResponse()  # noqa: E501
+        if include_optional :
             return FooGetDefaultResponse(
                 string = petstore_api.models.foo.Foo(
                     bar = 'bar', )
             )
-        else:
+        else :
             return FooGetDefaultResponse(
         )
-        """
 
     def testFooGetDefaultResponse(self):
         """Test FooGetDefaultResponse"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_format_test.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.format_test import FormatTest  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestFormatTest(unittest.TestCase):
     """FormatTest unit test stubs"""
@@ -26,46 +28,44 @@ class TestFormatTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> FormatTest:
+    def make_instance(self, include_optional):
         """Test FormatTest
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `FormatTest`
-        """
-        model = FormatTest()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.format_test.FormatTest()  # noqa: E501
+        if include_optional :
             return FormatTest(
-                integer = 10,
-                int32 = 20,
-                int64 = 56,
-                number = 32.1,
-                float = 54.3,
-                double = 67.8,
-                decimal = 1,
-                string = 'a',
-                string_with_double_quote_pattern = 'this is \"something\"',
-                byte = 'YQ==',
-                binary = bytes(b'blah'),
-                var_date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(),
-                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
-                uuid = '72f98069-206d-4f12-9f12-3d1e525a8e84',
-                password = '0123456789',
-                pattern_with_digits = '0480728880',
+                integer = 10, 
+                int32 = 20, 
+                int64 = 56, 
+                number = 132.1, 
+                float = 54.3, 
+                double = 67.8, 
+                decimal = 1, 
+                string = 'a', 
+                byte = bytes("someting", 'utf-8'), 
+                binary = bytes(b'blah'), 
+                date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(), 
+                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), 
+                uuid = '72f98069-206d-4f12-9f12-3d1e525a8e84', 
+                password = '0123456789', 
+                pattern_with_digits = '0480728880', 
                 pattern_with_digits_and_delimiter = 'image_480'
             )
-        else:
+        else :
             return FormatTest(
-                number = 32.1,
-                var_date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(),
+                number = 122.1,
+                byte = bytes("someting", 'utf-8'),
+                date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(),
                 password = '0123456789',
         )
-        """
 
     def testFormatTest(self):
         """Test FormatTest"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        # TODO
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_has_only_read_only.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.has_only_read_only import HasOnlyReadOnly  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestHasOnlyReadOnly(unittest.TestCase):
     """HasOnlyReadOnly unit test stubs"""
@@ -26,28 +28,25 @@ class TestHasOnlyReadOnly(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> HasOnlyReadOnly:
+    def make_instance(self, include_optional):
         """Test HasOnlyReadOnly
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `HasOnlyReadOnly`
-        """
-        model = HasOnlyReadOnly()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.has_only_read_only.HasOnlyReadOnly()  # noqa: E501
+        if include_optional :
             return HasOnlyReadOnly(
-                bar = '',
+                bar = '', 
                 foo = ''
             )
-        else:
+        else :
             return HasOnlyReadOnly(
         )
-        """
 
     def testHasOnlyReadOnly(self):
         """Test HasOnlyReadOnly"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_health_check_result.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.health_check_result import HealthCheckResult  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestHealthCheckResult(unittest.TestCase):
     """HealthCheckResult unit test stubs"""
@@ -26,27 +28,24 @@ class TestHealthCheckResult(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> HealthCheckResult:
+    def make_instance(self, include_optional):
         """Test HealthCheckResult
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `HealthCheckResult`
-        """
-        model = HealthCheckResult()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.health_check_result.HealthCheckResult()  # noqa: E501
+        if include_optional :
             return HealthCheckResult(
                 nullable_message = ''
             )
-        else:
+        else :
             return HealthCheckResult(
         )
-        """
 
     def testHealthCheckResult(self):
         """Test HealthCheckResult"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_inner_dict_with_property.py

@@ -3,19 +3,23 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
+from __future__ import absolute_import
+
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestInnerDictWithProperty(unittest.TestCase):
     """InnerDictWithProperty unit test stubs"""
@@ -26,19 +30,19 @@ class TestInnerDictWithProperty(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> InnerDictWithProperty:
+    def make_instance(self, include_optional):
         """Test InnerDictWithProperty
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `InnerDictWithProperty`
         """
-        model = InnerDictWithProperty()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.inner_dict_with_property.InnerDictWithProperty()  # noqa: E501
+        if include_optional :
             return InnerDictWithProperty(
                 a_property = None
             )
-        else:
+        else :
             return InnerDictWithProperty(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_int_or_string.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.int_or_string import IntOrString  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestIntOrString(unittest.TestCase):
     """IntOrString unit test stubs"""
@@ -26,18 +28,18 @@ class TestIntOrString(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> IntOrString:
+    def make_instance(self, include_optional):
         """Test IntOrString
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `IntOrString`
         """
-        model = IntOrString()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.int_or_string.IntOrString()  # noqa: E501
+        if include_optional :
             return IntOrString(
             )
-        else:
+        else :
             return IntOrString(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_list.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.list import List  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestList(unittest.TestCase):
     """List unit test stubs"""
@@ -26,27 +28,24 @@ class TestList(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> List:
+    def make_instance(self, include_optional):
         """Test List
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `List`
-        """
-        model = List()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.list.List()  # noqa: E501
+        if include_optional :
             return List(
-                var_123_list = ''
+                _123_list = ''
             )
-        else:
+        else :
             return List(
         )
-        """
 
     def testList(self):
         """Test List"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_map_of_array_of_model.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestMapOfArrayOfModel(unittest.TestCase):
     """MapOfArrayOfModel unit test stubs"""
@@ -26,15 +28,15 @@ class TestMapOfArrayOfModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> MapOfArrayOfModel:
+    def make_instance(self, include_optional):
         """Test MapOfArrayOfModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `MapOfArrayOfModel`
         """
-        model = MapOfArrayOfModel()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.map_of_array_of_model.MapOfArrayOfModel()  # noqa: E501
+        if include_optional :
             return MapOfArrayOfModel(
                 shop_id_to_org_online_lip_map = {
                     'key' : [
@@ -44,7 +46,7 @@ class TestMapOfArrayOfModel(unittest.TestCase):
                         ]
                     }
             )
-        else:
+        else :
             return MapOfArrayOfModel(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_map_test.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.map_test import MapTest  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestMapTest(unittest.TestCase):
     """MapTest unit test stubs"""
@@ -26,40 +28,38 @@ class TestMapTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> MapTest:
+    def make_instance(self, include_optional):
         """Test MapTest
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `MapTest`
-        """
-        model = MapTest()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.map_test.MapTest()  # noqa: E501
+        if include_optional :
             return MapTest(
                 map_map_of_string = {
                     'key' : {
                         'key' : ''
                         }
-                    },
+                    }, 
                 map_of_enum_string = {
                     'UPPER' : 'UPPER'
-                    },
+                    }, 
                 direct_map = {
                     'key' : True
-                    },
+                    }, 
                 indirect_map = {
                     'key' : True
                     }
             )
-        else:
+        else :
             return MapTest(
         )
-        """
 
     def testMapTest(self):
         """Test MapTest"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        # TODO
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_mixed_properties_and_additional_properties_class.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
     """MixedPropertiesAndAdditionalPropertiesClass unit test stubs"""
@@ -26,33 +28,30 @@ class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> MixedPropertiesAndAdditionalPropertiesClass:
+    def make_instance(self, include_optional):
         """Test MixedPropertiesAndAdditionalPropertiesClass
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `MixedPropertiesAndAdditionalPropertiesClass`
-        """
-        model = MixedPropertiesAndAdditionalPropertiesClass()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass()  # noqa: E501
+        if include_optional :
             return MixedPropertiesAndAdditionalPropertiesClass(
-                uuid = '',
-                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
+                uuid = '', 
+                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), 
                 map = {
                     'key' : petstore_api.models.animal.Animal(
                         class_name = '', 
                         color = 'red', )
                     }
             )
-        else:
+        else :
             return MixedPropertiesAndAdditionalPropertiesClass(
         )
-        """
 
     def testMixedPropertiesAndAdditionalPropertiesClass(self):
         """Test MixedPropertiesAndAdditionalPropertiesClass"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_model200_response.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.model200_response import Model200Response  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestModel200Response(unittest.TestCase):
     """Model200Response unit test stubs"""
@@ -26,28 +28,25 @@ class TestModel200Response(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Model200Response:
+    def make_instance(self, include_optional):
         """Test Model200Response
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Model200Response`
-        """
-        model = Model200Response()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.model200_response.Model200Response()  # noqa: E501
+        if include_optional :
             return Model200Response(
-                name = 56,
-                var_class = ''
+                name = 56, 
+                _class = ''
             )
-        else:
+        else :
             return Model200Response(
         )
-        """
 
     def testModel200Response(self):
         """Test Model200Response"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_model_return.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.model_return import ModelReturn  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestModelReturn(unittest.TestCase):
     """ModelReturn unit test stubs"""
@@ -26,27 +28,24 @@ class TestModelReturn(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ModelReturn:
+    def make_instance(self, include_optional):
         """Test ModelReturn
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ModelReturn`
-        """
-        model = ModelReturn()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.model_return.ModelReturn()  # noqa: E501
+        if include_optional :
             return ModelReturn(
-                var_return = 56
+                _return = 56
             )
-        else:
+        else :
             return ModelReturn(
         )
-        """
 
     def testModelReturn(self):
         """Test ModelReturn"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_name.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.name import Name  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestName(unittest.TestCase):
     """Name unit test stubs"""
@@ -26,31 +28,28 @@ class TestName(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Name:
+    def make_instance(self, include_optional):
         """Test Name
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Name`
-        """
-        model = Name()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.name.Name()  # noqa: E501
+        if include_optional :
             return Name(
-                name = 56,
-                snake_case = 56,
-                var_property = '',
-                var_123_number = 56
+                name = 56, 
+                snake_case = 56, 
+                _property = '', 
+                _123_number = 56
             )
-        else:
+        else :
             return Name(
                 name = 56,
         )
-        """
 
     def testName(self):
         """Test Name"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_nullable_class.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.nullable_class import NullableClass  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestNullableClass(unittest.TestCase):
     """NullableClass unit test stubs"""
@@ -26,52 +28,50 @@ class TestNullableClass(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> NullableClass:
+    def make_instance(self, include_optional):
         """Test NullableClass
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `NullableClass`
-        """
-        model = NullableClass()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.nullable_class.NullableClass()  # noqa: E501
+        if include_optional :
             return NullableClass(
                 required_integer_prop = 56,
-                integer_prop = 56,
-                number_prop = 1.337,
-                boolean_prop = True,
-                string_prop = '',
-                date_prop = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(),
-                datetime_prop = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
+                integer_prop = 56, 
+                number_prop = 1.337, 
+                boolean_prop = True, 
+                string_prop = '', 
+                date_prop = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(), 
+                datetime_prop = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), 
                 array_nullable_prop = [
                     None
-                    ],
+                    ], 
                 array_and_items_nullable_prop = [
                     None
-                    ],
+                    ], 
                 array_items_nullable = [
                     None
-                    ],
+                    ], 
                 object_nullable_prop = {
                     'key' : None
-                    },
+                    }, 
                 object_and_items_nullable_prop = {
                     'key' : None
-                    },
+                    }, 
                 object_items_nullable = {
                     'key' : None
                     }
             )
-        else:
+        else :
             return NullableClass(
-                required_integer_prop = 56,
+                required_integer_prop = 56
         )
-        """
 
     def testNullableClass(self):
         """Test NullableClass"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        # TODO
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_nullable_property.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.nullable_property import NullableProperty  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestNullableProperty(unittest.TestCase):
     """NullableProperty unit test stubs"""
@@ -26,20 +28,20 @@ class TestNullableProperty(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> NullableProperty:
+    def make_instance(self, include_optional):
         """Test NullableProperty
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `NullableProperty`
         """
-        model = NullableProperty()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.nullable_property.NullableProperty()  # noqa: E501
+        if include_optional :
             return NullableProperty(
-                id = 56,
+                id = 56, 
                 name = 'AUR,rZ#UM/?R,Fp^l6$ARjbhJk C>'
             )
-        else:
+        else :
             return NullableProperty(
                 id = 56,
                 name = 'AUR,rZ#UM/?R,Fp^l6$ARjbhJk C>',

samples/openapi3/client/petstore/python-pydantic-v1/test/test_number_only.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.number_only import NumberOnly  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestNumberOnly(unittest.TestCase):
     """NumberOnly unit test stubs"""
@@ -26,27 +28,24 @@ class TestNumberOnly(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> NumberOnly:
+    def make_instance(self, include_optional):
         """Test NumberOnly
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `NumberOnly`
-        """
-        model = NumberOnly()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.number_only.NumberOnly()  # noqa: E501
+        if include_optional :
             return NumberOnly(
                 just_number = 1.337
             )
-        else:
+        else :
             return NumberOnly(
         )
-        """
 
     def testNumberOnly(self):
         """Test NumberOnly"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_object_to_test_additional_properties.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.object_to_test_additional_properties import ObjectToTestAdditionalProperties  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestObjectToTestAdditionalProperties(unittest.TestCase):
     """ObjectToTestAdditionalProperties unit test stubs"""
@@ -26,19 +28,19 @@ class TestObjectToTestAdditionalProperties(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ObjectToTestAdditionalProperties:
+    def make_instance(self, include_optional):
         """Test ObjectToTestAdditionalProperties
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `ObjectToTestAdditionalProperties`
         """
-        model = ObjectToTestAdditionalProperties()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.object_to_test_additional_properties.ObjectToTestAdditionalProperties()  # noqa: E501
+        if include_optional :
             return ObjectToTestAdditionalProperties(
                 var_property = True
             )
-        else:
+        else :
             return ObjectToTestAdditionalProperties(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_object_with_deprecated_fields.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.object_with_deprecated_fields import ObjectWithDeprecatedFields  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestObjectWithDeprecatedFields(unittest.TestCase):
     """ObjectWithDeprecatedFields unit test stubs"""
@@ -26,33 +28,30 @@ class TestObjectWithDeprecatedFields(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ObjectWithDeprecatedFields:
+    def make_instance(self, include_optional):
         """Test ObjectWithDeprecatedFields
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ObjectWithDeprecatedFields`
-        """
-        model = ObjectWithDeprecatedFields()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.object_with_deprecated_fields.ObjectWithDeprecatedFields()  # noqa: E501
+        if include_optional :
             return ObjectWithDeprecatedFields(
-                uuid = '',
-                id = 1.337,
+                uuid = '', 
+                id = 1.337, 
                 deprecated_ref = petstore_api.models.deprecated_object.DeprecatedObject(
-                    name = '', ),
+                    name = '', ), 
                 bars = [
                     'bar'
                     ]
             )
-        else:
+        else :
             return ObjectWithDeprecatedFields(
         )
-        """
 
     def testObjectWithDeprecatedFields(self):
         """Test ObjectWithDeprecatedFields"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_one_of_enum_string.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.one_of_enum_string import OneOfEnumString  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOneOfEnumString(unittest.TestCase):
     """OneOfEnumString unit test stubs"""
@@ -26,18 +28,18 @@ class TestOneOfEnumString(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> OneOfEnumString:
+    def make_instance(self, include_optional):
         """Test OneOfEnumString
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `OneOfEnumString`
         """
-        model = OneOfEnumString()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.one_of_enum_string.OneOfEnumString()  # noqa: E501
+        if include_optional :
             return OneOfEnumString(
             )
-        else:
+        else :
             return OneOfEnumString(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_order.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.order import Order  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOrder(unittest.TestCase):
     """Order unit test stubs"""
@@ -26,32 +28,29 @@ class TestOrder(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Order:
+    def make_instance(self, include_optional):
         """Test Order
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Order`
-        """
-        model = Order()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.order.Order()  # noqa: E501
+        if include_optional :
             return Order(
-                id = 56,
-                pet_id = 56,
-                quantity = 56,
-                ship_date = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
-                status = 'placed',
+                id = 56, 
+                pet_id = 56, 
+                quantity = 56, 
+                ship_date = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), 
+                status = 'placed', 
                 complete = True
             )
-        else:
+        else :
             return Order(
         )
-        """
 
     def testOrder(self):
         """Test Order"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_composite.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_composite import OuterComposite  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterComposite(unittest.TestCase):
     """OuterComposite unit test stubs"""
@@ -26,29 +28,26 @@ class TestOuterComposite(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> OuterComposite:
+    def make_instance(self, include_optional):
         """Test OuterComposite
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `OuterComposite`
-        """
-        model = OuterComposite()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.outer_composite.OuterComposite()  # noqa: E501
+        if include_optional :
             return OuterComposite(
-                my_number = 1.337,
-                my_string = '',
+                my_number = 1.337, 
+                my_string = '', 
                 my_boolean = True
             )
-        else:
+        else :
             return OuterComposite(
         )
-        """
 
     def testOuterComposite(self):
         """Test OuterComposite"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_enum.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_enum import OuterEnum  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterEnum(unittest.TestCase):
     """OuterEnum unit test stubs"""
@@ -28,7 +30,7 @@ class TestOuterEnum(unittest.TestCase):
 
     def testOuterEnum(self):
         """Test OuterEnum"""
-        # inst = OuterEnum()
+        inst = OuterEnum("placed")
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_enum_default_value.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterEnumDefaultValue(unittest.TestCase):
     """OuterEnumDefaultValue unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_enum_integer.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_enum_integer import OuterEnumInteger  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterEnumInteger(unittest.TestCase):
     """OuterEnumInteger unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_enum_integer_default_value.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterEnumIntegerDefaultValue(unittest.TestCase):
     """OuterEnumIntegerDefaultValue unit test stubs"""
@@ -26,9 +28,23 @@ class TestOuterEnumIntegerDefaultValue(unittest.TestCase):
     def tearDown(self):
         pass
 
+    def make_instance(self, include_optional):
+        """Test OuterEnumIntegerDefaultValue
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # model = petstore_api.models.outer_enum_integer_default_value.OuterEnumIntegerDefaultValue()  # noqa: E501
+        if include_optional :
+            return OuterEnumIntegerDefaultValue(
+            )
+        else :
+            return OuterEnumIntegerDefaultValue(
+        )
+
     def testOuterEnumIntegerDefaultValue(self):
         """Test OuterEnumIntegerDefaultValue"""
-        # inst = OuterEnumIntegerDefaultValue()
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_outer_object_with_enum_property.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestOuterObjectWithEnumProperty(unittest.TestCase):
     """OuterObjectWithEnumProperty unit test stubs"""
@@ -26,24 +28,20 @@ class TestOuterObjectWithEnumProperty(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> OuterObjectWithEnumProperty:
+    def make_instance(self, include_optional):
         """Test OuterObjectWithEnumProperty
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `OuterObjectWithEnumProperty`
-        """
-        model = OuterObjectWithEnumProperty()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.outer_object_with_enum_property.OuterObjectWithEnumProperty()  # noqa: E501
+        if include_optional :
             return OuterObjectWithEnumProperty(
-                str_value = 'placed',
                 value = 2
             )
-        else:
+        else :
             return OuterObjectWithEnumProperty(
                 value = 2,
         )
-        """
 
     def testOuterObjectWithEnumProperty(self):
         """Test OuterObjectWithEnumProperty"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_parent.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.parent import Parent  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestParent(unittest.TestCase):
     """Parent unit test stubs"""
@@ -26,22 +28,22 @@ class TestParent(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Parent:
+    def make_instance(self, include_optional):
         """Test Parent
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `Parent`
         """
-        model = Parent()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.parent.Parent()  # noqa: E501
+        if include_optional :
             return Parent(
                 optional_dict = {
                     'key' : petstore_api.models.inner_dict_with_property.InnerDictWithProperty(
                         a_property = petstore_api.models.a_property.aProperty(), )
                     }
             )
-        else:
+        else :
             return Parent(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_parent_with_optional_dict.py

@@ -3,19 +3,23 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
+from __future__ import absolute_import
+
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestParentWithOptionalDict(unittest.TestCase):
     """ParentWithOptionalDict unit test stubs"""
@@ -26,22 +30,22 @@ class TestParentWithOptionalDict(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ParentWithOptionalDict:
+    def make_instance(self, include_optional):
         """Test ParentWithOptionalDict
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `ParentWithOptionalDict`
         """
-        model = ParentWithOptionalDict()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.parent_with_optional_dict.ParentWithOptionalDict()  # noqa: E501
+        if include_optional :
             return ParentWithOptionalDict(
                 optional_dict = {
                     'key' : petstore_api.models.inner_dict_with_property.InnerDictWithProperty(
                         a_property = petstore_api.models.a_property.aProperty(), )
                     }
             )
-        else:
+        else :
             return ParentWithOptionalDict(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_pet.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.pet import Pet  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestPet(unittest.TestCase):
     """Pet unit test stubs"""
@@ -26,44 +28,41 @@ class TestPet(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Pet:
+    def make_instance(self, include_optional):
         """Test Pet
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Pet`
-        """
-        model = Pet()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.pet.Pet()  # noqa: E501
+        if include_optional :
             return Pet(
-                id = 56,
+                id = 56, 
                 category = petstore_api.models.category.Category(
                     id = 56, 
-                    name = 'default-name', ),
-                name = 'doggie',
+                    name = 'default-name', ), 
+                name = 'doggie', 
                 photo_urls = [
                     ''
-                    ],
+                    ], 
                 tags = [
                     petstore_api.models.tag.Tag(
                         id = 56, 
                         name = '', )
-                    ],
+                    ], 
                 status = 'available'
             )
-        else:
+        else :
             return Pet(
                 name = 'doggie',
                 photo_urls = [
                     ''
                     ],
         )
-        """
 
     def testPet(self):
         """Test Pet"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_pet_api.py

@@ -3,86 +3,88 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
+import petstore_api
 from petstore_api.api.pet_api import PetApi  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestPetApi(unittest.TestCase):
     """PetApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = PetApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.pet_api.PetApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_add_pet(self) -> None:
+    def test_add_pet(self):
         """Test case for add_pet
 
         Add a new pet to the store  # noqa: E501
         """
         pass
 
-    def test_delete_pet(self) -> None:
+    def test_delete_pet(self):
         """Test case for delete_pet
 
         Deletes a pet  # noqa: E501
         """
         pass
 
-    def test_find_pets_by_status(self) -> None:
+    def test_find_pets_by_status(self):
         """Test case for find_pets_by_status
 
         Finds Pets by status  # noqa: E501
         """
         pass
 
-    def test_find_pets_by_tags(self) -> None:
+    def test_find_pets_by_tags(self):
         """Test case for find_pets_by_tags
 
         Finds Pets by tags  # noqa: E501
         """
         pass
 
-    def test_get_pet_by_id(self) -> None:
+    def test_get_pet_by_id(self):
         """Test case for get_pet_by_id
 
         Find pet by ID  # noqa: E501
         """
         pass
 
-    def test_update_pet(self) -> None:
+    def test_update_pet(self):
         """Test case for update_pet
 
         Update an existing pet  # noqa: E501
         """
         pass
 
-    def test_update_pet_with_form(self) -> None:
+    def test_update_pet_with_form(self):
         """Test case for update_pet_with_form
 
         Updates a pet in the store with form data  # noqa: E501
         """
         pass
 
-    def test_upload_file(self) -> None:
+    def test_upload_file(self):
         """Test case for upload_file
 
         uploads an image  # noqa: E501
         """
         pass
 
-    def test_upload_file_with_required_file(self) -> None:
+    def test_upload_file_with_required_file(self):
         """Test case for upload_file_with_required_file
 
         uploads an image (required)  # noqa: E501

samples/openapi3/client/petstore/python-pydantic-v1/test/test_pig.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.pig import Pig  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestPig(unittest.TestCase):
     """Pig unit test stubs"""
@@ -26,28 +28,6 @@ class TestPig(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Pig:
-        """Test Pig
-            include_option is a boolean, when False only required
-            params are included, when True both required and
-            optional params are included """
-        # uncomment below to create an instance of `Pig`
-        """
-        model = Pig()  # noqa: E501
-        if include_optional:
-            return Pig(
-                class_name = '',
-                color = '',
-                size = 56
-            )
-        else:
-            return Pig(
-                class_name = '',
-                color = '',
-                size = 56,
-        )
-        """
-
     def testPig(self):
         """Test Pig"""
         # inst_req_only = self.make_instance(include_optional=False)

samples/openapi3/client/petstore/python-pydantic-v1/test/test_property_name_collision.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.property_name_collision import PropertyNameCollision  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestPropertyNameCollision(unittest.TestCase):
     """PropertyNameCollision unit test stubs"""
@@ -26,21 +28,21 @@ class TestPropertyNameCollision(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> PropertyNameCollision:
+    def make_instance(self, include_optional):
         """Test PropertyNameCollision
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `PropertyNameCollision`
         """
-        model = PropertyNameCollision()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.property_name_collision.PropertyNameCollision()  # noqa: E501
+        if include_optional :
             return PropertyNameCollision(
-                underscore_type = '',
-                type = '',
-                type_with_underscore = ''
+                underscoreType = '', 
+                type = '', 
+                typeWithUnderscore = ''
             )
-        else:
+        else :
             return PropertyNameCollision(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_read_only_first.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestReadOnlyFirst(unittest.TestCase):
     """ReadOnlyFirst unit test stubs"""
@@ -26,28 +28,25 @@ class TestReadOnlyFirst(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> ReadOnlyFirst:
+    def make_instance(self, include_optional):
         """Test ReadOnlyFirst
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `ReadOnlyFirst`
-        """
-        model = ReadOnlyFirst()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.read_only_first.ReadOnlyFirst()  # noqa: E501
+        if include_optional :
             return ReadOnlyFirst(
-                bar = '',
+                bar = '', 
                 baz = ''
             )
-        else:
+        else :
             return ReadOnlyFirst(
         )
-        """
 
     def testReadOnlyFirst(self):
         """Test ReadOnlyFirst"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_second_ref.py

@@ -3,19 +3,23 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
+from __future__ import absolute_import
+
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.second_ref import SecondRef  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSecondRef(unittest.TestCase):
     """SecondRef unit test stubs"""
@@ -26,17 +30,17 @@ class TestSecondRef(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> SecondRef:
+    def make_instance(self, include_optional):
         """Test SecondRef
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `SecondRef`
         """
-        model = SecondRef()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.second_ref.SecondRef()  # noqa: E501
+        if include_optional :
             return SecondRef(
-                category = '',
+                category = '', 
                 circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model(
                     size = 56, 
                     nested = petstore_api.models.first_ref.FirstRef(
@@ -44,7 +48,7 @@ class TestSecondRef(unittest.TestCase):
                         self_ref = petstore_api.models.second_ref.SecondRef(
                             category = '', ), ), )
             )
-        else:
+        else :
             return SecondRef(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_self_reference_model.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.self_reference_model import SelfReferenceModel  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSelfReferenceModel(unittest.TestCase):
     """SelfReferenceModel unit test stubs"""
@@ -26,17 +28,17 @@ class TestSelfReferenceModel(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> SelfReferenceModel:
+    def make_instance(self, include_optional):
         """Test SelfReferenceModel
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `SelfReferenceModel`
         """
-        model = SelfReferenceModel()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.self_reference_model.SelfReferenceModel()  # noqa: E501
+        if include_optional :
             return SelfReferenceModel(
-                size = 56,
+                size = 56, 
                 nested = petstore_api.models.dummy_model.Dummy-Model(
                     category = '', 
                     self_ref = petstore_api.models.self_reference_model.Self-Reference-Model(
@@ -44,7 +46,7 @@ class TestSelfReferenceModel(unittest.TestCase):
                         nested = petstore_api.models.dummy_model.Dummy-Model(
                             category = '', ), ), )
             )
-        else:
+        else :
             return SelfReferenceModel(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_single_ref_type.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.single_ref_type import SingleRefType  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSingleRefType(unittest.TestCase):
     """SingleRefType unit test stubs"""
@@ -26,9 +28,23 @@ class TestSingleRefType(unittest.TestCase):
     def tearDown(self):
         pass
 
+    def make_instance(self, include_optional):
+        """Test SingleRefType
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # model = petstore_api.models.single_ref_type.SingleRefType()  # noqa: E501
+        if include_optional :
+            return SingleRefType(
+            )
+        else :
+            return SingleRefType(
+        )
+
     def testSingleRefType(self):
         """Test SingleRefType"""
-        # inst = SingleRefType()
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_special_character_enum.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.special_character_enum import SpecialCharacterEnum  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSpecialCharacterEnum(unittest.TestCase):
     """SpecialCharacterEnum unit test stubs"""

samples/openapi3/client/petstore/python-pydantic-v1/test/test_special_model_name.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.special_model_name import SpecialModelName  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSpecialModelName(unittest.TestCase):
     """SpecialModelName unit test stubs"""
@@ -26,27 +28,24 @@ class TestSpecialModelName(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> SpecialModelName:
+    def make_instance(self, include_optional):
         """Test SpecialModelName
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `SpecialModelName`
-        """
-        model = SpecialModelName()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.special_model_name.SpecialModelName()  # noqa: E501
+        if include_optional :
             return SpecialModelName(
                 special_property_name = 56
             )
-        else:
+        else :
             return SpecialModelName(
         )
-        """
 
     def testSpecialModelName(self):
         """Test SpecialModelName"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_special_name.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.special_name import SpecialName  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestSpecialName(unittest.TestCase):
     """SpecialName unit test stubs"""
@@ -26,23 +28,23 @@ class TestSpecialName(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> SpecialName:
+    def make_instance(self, include_optional):
         """Test SpecialName
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `SpecialName`
         """
-        model = SpecialName()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.special_name.SpecialName()  # noqa: E501
+        if include_optional :
             return SpecialName(
-                var_property = 56,
+                var_property = 56, 
                 var_async = petstore_api.models.category.Category(
                     id = 56, 
-                    name = 'default-name', ),
-                var_schema = 'available'
+                    name = 'default-name', ), 
+                status = 'available'
             )
-        else:
+        else :
             return SpecialName(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_store_api.py

@@ -3,51 +3,53 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
+import petstore_api
 from petstore_api.api.store_api import StoreApi  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestStoreApi(unittest.TestCase):
     """StoreApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = StoreApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.store_api.StoreApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_delete_order(self) -> None:
+    def test_delete_order(self):
         """Test case for delete_order
 
         Delete purchase order by ID  # noqa: E501
         """
         pass
 
-    def test_get_inventory(self) -> None:
+    def test_get_inventory(self):
         """Test case for get_inventory
 
         Returns pet inventories by status  # noqa: E501
         """
         pass
 
-    def test_get_order_by_id(self) -> None:
+    def test_get_order_by_id(self):
         """Test case for get_order_by_id
 
         Find purchase order by ID  # noqa: E501
         """
         pass
 
-    def test_place_order(self) -> None:
+    def test_place_order(self):
         """Test case for place_order
 
         Place an order for a pet  # noqa: E501

samples/openapi3/client/petstore/python-pydantic-v1/test/test_tag.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.tag import Tag  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestTag(unittest.TestCase):
     """Tag unit test stubs"""
@@ -26,28 +28,25 @@ class TestTag(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Tag:
+    def make_instance(self, include_optional):
         """Test Tag
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `Tag`
-        """
-        model = Tag()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.tag.Tag()  # noqa: E501
+        if include_optional :
             return Tag(
-                id = 56,
+                id = 56, 
                 name = ''
             )
-        else:
+        else :
             return Tag(
         )
-        """
 
     def testTag(self):
         """Test Tag"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_tiger.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""  # noqa: E501
+"""
 
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.tiger import Tiger  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestTiger(unittest.TestCase):
     """Tiger unit test stubs"""
@@ -26,19 +28,19 @@ class TestTiger(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> Tiger:
+    def make_instance(self, include_optional):
         """Test Tiger
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `Tiger`
         """
-        model = Tiger()  # noqa: E501
-        if include_optional:
+        model = petstore_api.models.tiger.Tiger()  # noqa: E501
+        if include_optional :
             return Tiger(
                 skill = ''
             )
-        else:
+        else :
             return Tiger(
         )
         """

samples/openapi3/client/petstore/python-pydantic-v1/test/test_user.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.user import User  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestUser(unittest.TestCase):
     """User unit test stubs"""
@@ -26,34 +28,31 @@ class TestUser(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> User:
+    def make_instance(self, include_optional):
         """Test User
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `User`
-        """
-        model = User()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.user.User()  # noqa: E501
+        if include_optional :
             return User(
-                id = 56,
-                username = '',
-                first_name = '',
-                last_name = '',
-                email = '',
-                password = '',
-                phone = '',
+                id = 56, 
+                username = '', 
+                first_name = '', 
+                last_name = '', 
+                email = '', 
+                password = '', 
+                phone = '', 
                 user_status = 56
             )
-        else:
+        else :
             return User(
         )
-        """
 
     def testUser(self):
         """Test User"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/test/test_user_api.py

@@ -3,79 +3,81 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 
+import petstore_api
 from petstore_api.api.user_api import UserApi  # noqa: E501
+from petstore_api.rest import ApiException
 
 
 class TestUserApi(unittest.TestCase):
     """UserApi unit test stubs"""
 
-    def setUp(self) -> None:
-        self.api = UserApi()  # noqa: E501
+    def setUp(self):
+        self.api = petstore_api.api.user_api.UserApi()  # noqa: E501
 
-    def tearDown(self) -> None:
+    def tearDown(self):
         pass
 
-    def test_create_user(self) -> None:
+    def test_create_user(self):
         """Test case for create_user
 
         Create user  # noqa: E501
         """
         pass
 
-    def test_create_users_with_array_input(self) -> None:
+    def test_create_users_with_array_input(self):
         """Test case for create_users_with_array_input
 
         Creates list of users with given input array  # noqa: E501
         """
         pass
 
-    def test_create_users_with_list_input(self) -> None:
+    def test_create_users_with_list_input(self):
         """Test case for create_users_with_list_input
 
         Creates list of users with given input array  # noqa: E501
         """
         pass
 
-    def test_delete_user(self) -> None:
+    def test_delete_user(self):
         """Test case for delete_user
 
         Delete user  # noqa: E501
         """
         pass
 
-    def test_get_user_by_name(self) -> None:
+    def test_get_user_by_name(self):
         """Test case for get_user_by_name
 
         Get user by user name  # noqa: E501
         """
         pass
 
-    def test_login_user(self) -> None:
+    def test_login_user(self):
         """Test case for login_user
 
         Logs user into the system  # noqa: E501
         """
         pass
 
-    def test_logout_user(self) -> None:
+    def test_logout_user(self):
         """Test case for logout_user
 
         Logs out current logged in user session  # noqa: E501
         """
         pass
 
-    def test_update_user(self) -> None:
+    def test_update_user(self):
         """Test case for update_user
 
         Updated user  # noqa: E501

samples/openapi3/client/petstore/python-pydantic-v1/test/test_with_nested_one_of.py

@@ -3,19 +3,21 @@
 """
     OpenAPI Petstore
 
-    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
 
     The version of the OpenAPI document: 1.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+    Generated by: https://openapi-generator.tech
+"""
 
-    Do not edit the class manually.
-"""  # noqa: E501
 
+from __future__ import absolute_import
 
 import unittest
 import datetime
 
+import petstore_api
 from petstore_api.models.with_nested_one_of import WithNestedOneOf  # noqa: E501
+from petstore_api.rest import ApiException
 
 class TestWithNestedOneOf(unittest.TestCase):
     """WithNestedOneOf unit test stubs"""
@@ -26,29 +28,25 @@ class TestWithNestedOneOf(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional) -> WithNestedOneOf:
+    def make_instance(self, include_optional):
         """Test WithNestedOneOf
             include_option is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
-        # uncomment below to create an instance of `WithNestedOneOf`
-        """
-        model = WithNestedOneOf()  # noqa: E501
-        if include_optional:
+        # model = petstore_api.models.with_nested_one_of.WithNestedOneOf()  # noqa: E501
+        if include_optional :
             return WithNestedOneOf(
-                size = 56,
-                nested_pig = None,
-                nested_oneof_enum_string = None
+                size = 56, 
+                nested_pig = None
             )
-        else:
+        else :
             return WithNestedOneOf(
         )
-        """
 
     def testWithNestedOneOf(self):
         """Test WithNestedOneOf"""
-        # inst_req_only = self.make_instance(include_optional=False)
-        # inst_req_and_optional = self.make_instance(include_optional=True)
+        #inst_req_only = self.make_instance(include_optional=False)
+        #inst_req_and_optional = self.make_instance(include_optional=True)
 
 if __name__ == '__main__':
     unittest.main()