Fixes python-experimental test_dog tests

modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache

@@ -17,7 +17,7 @@
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
 {{#requiredVars}}

modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache

@@ -57,4 +57,4 @@
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)

modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache

@@ -73,7 +73,6 @@ class OpenApiModel(object):
             # we don't have a discriminator
             # or we have already visited this class before and are sure that we
             # want to instantiate it this time
-
             return super(OpenApiModel, cls).__new__(cls)
 
         oneof_anyof_classes = []
@@ -92,12 +91,13 @@ class OpenApiModel(object):
                 "property '%s'='%s' at path: %s" %
                 (disc_prop_name_js, disc_prop_value, path_to_item)
             )
-        oneof_anyof_child = new_cls in oneof_anyof_classes
 
-        new_visited_composed_classes = [cls]
-        new_visited_composed_classes.extend(
-            visited_composed_classes)
-        kwargs['_visited_composed_classes'] = new_visited_composed_classes
+        if new_cls in visited_composed_classes:
+            # if we are coming from the chosen new_cls use cls instead
+            return super(OpenApiModel, cls).__new__(cls)
+
+        oneof_anyof_child = new_cls in oneof_anyof_classes
+        kwargs['_visited_composed_classes'] = visited_composed_classes + (cls,)
 
         if cls._composed_schemas.get('allOf') and oneof_anyof_child:
             # validate that we can make self because when we make the

samples/client/petstore/python-experimental/petstore_api/model_utils.py

@@ -143,7 +143,6 @@ def __new__(cls, *args, **kwargs):
             # we don't have a discriminator
             # or we have already visited this class before and are sure that we
             # want to instantiate it this time
-
             return super(OpenApiModel, cls).__new__(cls)
 
         oneof_anyof_classes = []
@@ -162,12 +161,13 @@ def __new__(cls, *args, **kwargs):
                 "property '%s'='%s' at path: %s" %
                 (disc_prop_name_js, disc_prop_value, path_to_item)
             )
-        oneof_anyof_child = new_cls in oneof_anyof_classes
 
-        new_visited_composed_classes = [cls]
-        new_visited_composed_classes.extend(
-            visited_composed_classes)
-        kwargs['_visited_composed_classes'] = new_visited_composed_classes
+        if new_cls in visited_composed_classes:
+            # if we are coming from the chosen new_cls use cls instead
+            return super(OpenApiModel, cls).__new__(cls)
+
+        oneof_anyof_child = new_cls in oneof_anyof_classes
+        kwargs['_visited_composed_classes'] = visited_composed_classes + (cls,)
 
         if cls._composed_schemas.get('allOf') and oneof_anyof_child:
             # validate that we can make self because when we make the

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py

@@ -170,7 +170,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/animal.py

@@ -161,7 +161,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         self.class_name = class_name
         for var_name, var_value in six.iteritems(kwargs):

samples/client/petstore/python-experimental/petstore_api/models/api_response.py

@@ -146,7 +146,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/array_test.py

@@ -151,7 +151,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/capitalization.py

@@ -155,7 +155,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/cat.py

@@ -163,14 +163,14 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
             'class_name': class_name,

samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/category.py

@@ -145,7 +145,7 @@ def __init__(self, name='default-name', _check_type=True, _from_server=False, _p
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         self.name = name
         for var_name, var_value in six.iteritems(kwargs):

samples/client/petstore/python-experimental/petstore_api/models/child.py

@@ -157,14 +157,14 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
         }

samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/child_cat.py

@@ -160,14 +160,14 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
             'pet_type': pet_type,

samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/child_dog.py

@@ -160,14 +160,14 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
             'pet_type': pet_type,

samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py

@@ -160,14 +160,14 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
             'pet_type': pet_type,

samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/class_model.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/client.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/dog.py

@@ -163,14 +163,14 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
             '_from_server': _from_server,
             '_configuration': _configuration,
-            '_visited_composed_classes': _visited_composed_classes,
+            '_visited_composed_classes': self._visited_composed_classes,
         }
         required_args = {
             'class_name': class_name,

samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py

@@ -140,7 +140,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \

samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py

@@ -151,7 +151,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         self._from_server = _from_server
         self._path_to_item = _path_to_item
         self._configuration = _configuration
-        self._visited_composed_classes = _visited_composed_classes
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         for var_name, var_value in six.iteritems(kwargs):
             if var_name not in self.attribute_map and \