NPE and Circular reference regression fix.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

@@ -651,7 +651,7 @@ public void postProcessParameter(CodegenParameter p) {
         // set baseType to null so the api docs will not point to a model for languageSpecificPrimitives
         if (p.baseType != null && languageSpecificPrimitives.contains(p.baseType)){
             p.baseType = null;
-        } else if (p.isListContainer && p.mostInnerItems.complexType != null && !languageSpecificPrimitives.contains(p.mostInnerItems.complexType)) {
+        } else if (p.isListContainer && p.mostInnerItems != null && p.mostInnerItems.complexType != null && !languageSpecificPrimitives.contains(p.mostInnerItems.complexType)) {
             // fix ListContainers
             p.baseType = getPythonClassName(p.mostInnerItems.complexType);
         }

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

@@ -29,7 +29,10 @@
 {{/optionalVars}}
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
 {{#requiredVars}}
         '{{name}}': ({{{dataType}}},),  # noqa: E501
 {{/requiredVars}}

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesAnyType(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesArray(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesBoolean(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesClass(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'map_string': ({str: (str,)},),  # noqa: E501
         'map_number': ({str: (float,)},),  # noqa: E501
         'map_integer': ({str: (int,)},),  # noqa: E501

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesInteger(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesNumber(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesObject(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class AdditionalPropertiesString(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class Animal(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'class_name': (str,),  # noqa: E501
         'color': (str,),  # noqa: E501
     }

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

@@ -59,7 +59,10 @@ class ApiResponse(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'code': (int,),  # noqa: E501
         'type': (str,),  # noqa: E501
         'message': (str,),  # noqa: E501

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

@@ -59,7 +59,10 @@ class ArrayOfArrayOfNumberOnly(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'array_array_number': ([[float]],),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class ArrayOfNumberOnly(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'array_number': ([float],),  # noqa: E501
     }
 

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

@@ -63,7 +63,10 @@ class ArrayTest(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'array_of_string': ([str],),  # noqa: E501
         'array_array_of_integer': ([[int]],),  # noqa: E501
         'array_array_of_model': ([[read_only_first.ReadOnlyFirst]],),  # noqa: E501

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

@@ -59,7 +59,10 @@ class Capitalization(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'small_camel': (str,),  # noqa: E501
         'capital_camel': (str,),  # noqa: E501
         'small_snake': (str,),  # noqa: E501

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

@@ -67,7 +67,10 @@ class Cat(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'class_name': (str,),  # noqa: E501
         'declawed': (bool,),  # noqa: E501
         'color': (str,),  # noqa: E501

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

@@ -59,7 +59,10 @@ class CatAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'declawed': (bool,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class Category(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
         'id': (int,),  # noqa: E501
     }

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

@@ -67,7 +67,10 @@ class Child(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'radio_waves': (bool,),  # noqa: E501
         'tele_vision': (bool,),  # noqa: E501
         'inter_net': (bool,),  # noqa: E501

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

@@ -59,7 +59,10 @@ class ChildAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'inter_net': (bool,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class ChildCat(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'pet_type': (str,),  # noqa: E501
         'name': (str,),  # noqa: E501
     }

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

@@ -59,7 +59,10 @@ class ChildCatAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'name': (str,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class ChildDog(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'pet_type': (str,),  # noqa: E501
         'bark': (str,),  # noqa: E501
     }

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

@@ -59,7 +59,10 @@ class ChildDogAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'bark': (str,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class ChildLizard(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'pet_type': (str,),  # noqa: E501
         'loves_rocks': (bool,),  # noqa: E501
     }

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

@@ -59,7 +59,10 @@ class ChildLizardAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'loves_rocks': (bool,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class ClassModel(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         '_class': (str,),  # noqa: E501
     }
 

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

@@ -59,7 +59,10 @@ class Client(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'client': (str,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class Dog(ModelComposed):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'class_name': (str,),  # noqa: E501
         'breed': (str,),  # noqa: E501
         'color': (str,),  # noqa: E501

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

@@ -59,7 +59,10 @@ class DogAllOf(ModelNormal):
     allowed_values = {
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'breed': (str,),  # noqa: E501
     }
 

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

@@ -67,7 +67,10 @@ class EnumArrays(ModelNormal):
         },
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'just_symbol': (str,),  # noqa: E501
         'array_enum': ([str],),  # noqa: E501
     }

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

@@ -60,7 +60,10 @@ class EnumClass(ModelSimple):
         },
     }
 
-    openapi_types = {
+    @staticmethod
+    @property
+    def openapi_types():
+        return {
         'value': (str,),  # noqa: E501
     }