[Python-experimental] JSON schema 'null' type should be modeled as 'none_type'

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

@@ -143,6 +143,7 @@ public PythonClientCodegen() {
         // map uuid to string for the time being
         typeMapping.put("UUID", "str");
         typeMapping.put("URI", "str");
+        typeMapping.put("null", "none_type");
 
         // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
         setReservedWordsLowerCase(

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

@@ -388,7 +388,9 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
                 composedSchemaSets.add(cm.oneOf);
                 for (Set<String> importSet : composedSchemaSets) {
                     for (String otherModelName : importSet) {
-                        cm.imports.add(otherModelName);
+                        if (!languageSpecificPrimitives.contains(otherModelName)) {
+                            cm.imports.add(otherModelName);
+                        }
                     }
                 }
 

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

@@ -969,9 +969,10 @@ def get_oneof_instance(self, model_args, constant_args):
     schemas described by oneOf.
     Args:
         self: the class we are handling
-        model_args (dict): var_name to var_value
+        model_args (dict/None): var_name to var_value
             The input data, e.g. the payload that must match a oneOf schema
-            in the OpenAPI document.
+            in the OpenAPI document. If the input data is the null value,
+            model_args is None.
         constant_args (dict): var_name to var_value
             args that every model requires, including configuration, server
             and path to item.
@@ -986,6 +987,13 @@ def get_oneof_instance(self, model_args, constant_args):
     # Iterate over each oneOf schema and determine if the input data
     # matches the oneOf schemas.
     for oneof_class in self._composed_schemas()['oneOf']:
+        if oneof_class is none_type:
+            # The only way the input data can match the 'None' type
+            # is if the input data is the 'null' value.
+            if model_args is None:
+                # The input data matches the 'None' type.
+                oneof_instances.append(model_args)
+            continue
         # transform js keys from input data to python keys in fixed_model_args
         fixed_model_args = change_keys_js_to_python(
             model_args, oneof_class)
@@ -1030,10 +1038,13 @@ def get_anyof_instances(self, model_args, constant_args):
     """
     Args:
         self: the class we are handling
-        model_args (dict): var_name to var_value
-            used to make instances
+        model_args (dict/None): var_name to var_value
+            The input data, e.g. the payload that must match at least one
+            anyOf child schema in the OpenAPI document. If the input data
+            is the null value, model_args is None.
         constant_args (dict): var_name to var_value
-            used to make instances
+            args that every model requires, including configuration, server
+            and path to item.
 
     Returns
         anyof_instances (list)
@@ -1043,6 +1054,13 @@ def get_anyof_instances(self, model_args, constant_args):
         return anyof_instances
 
     for anyof_class in self._composed_schemas()['anyOf']:
+        if anyof_class is none_type:
+            # The only way the input data can match the 'None' type
+            # is if the input data is the 'null' value.
+            if model_args is None:
+                # The input data matches the 'None' type.
+                anyof_instances.append(model_args)
+            continue
         # transform js keys to python keys in fixed_model_args
         fixed_model_args = change_keys_js_to_python(model_args, anyof_class)
 

modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

@@ -1855,6 +1855,7 @@ components:
           - $ref: '#/components/schemas/banana'
     fruitReq:
        oneOf:
+          - type: 'null'
           - $ref: '#/components/schemas/appleReq'
           - $ref: '#/components/schemas/bananaReq'
     appleReq:

samples/openapi3/client/petstore/go-experimental/go-petstore/api/openapi.yaml

@@ -1973,6 +1973,7 @@ components:
           type: string
     fruitReq:
       oneOf:
+      - type: "null"
       - $ref: '#/components/schemas/appleReq'
       - $ref: '#/components/schemas/bananaReq'
       x-one-of-name: FruitReq

samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go

@@ -37,6 +37,12 @@ func (s *FruitReq) UnmarshalJSON(src []byte) error {
 		s.FruitReqInterface = unmarshaledBananaReq
 		return nil
 	}
+	var unmarshaledNull *Null = &Null{}
+	err = json.Unmarshal(src, unmarshaledNull)
+	if err == nil {
+		s.FruitReqInterface = unmarshaledNull
+		return nil
+	}
 	return fmt.Errorf("No oneOf model could be deserialized from payload: %s", string(src))
 }
 type NullableFruitReq struct {

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

@@ -1231,9 +1231,10 @@ def get_oneof_instance(self, model_args, constant_args):
     schemas described by oneOf.
     Args:
         self: the class we are handling
-        model_args (dict): var_name to var_value
+        model_args (dict/None): var_name to var_value
             The input data, e.g. the payload that must match a oneOf schema
-            in the OpenAPI document.
+            in the OpenAPI document. If the input data is the null value,
+            model_args is None.
         constant_args (dict): var_name to var_value
             args that every model requires, including configuration, server
             and path to item.
@@ -1248,6 +1249,13 @@ def get_oneof_instance(self, model_args, constant_args):
     # Iterate over each oneOf schema and determine if the input data
     # matches the oneOf schemas.
     for oneof_class in self._composed_schemas()['oneOf']:
+        if oneof_class is none_type:
+            # The only way the input data can match the 'None' type
+            # is if the input data is the 'null' value.
+            if model_args is None:
+                # The input data matches the 'None' type.
+                oneof_instances.append(model_args)
+            continue
         # transform js keys from input data to python keys in fixed_model_args
         fixed_model_args = change_keys_js_to_python(
             model_args, oneof_class)
@@ -1292,10 +1300,13 @@ def get_anyof_instances(self, model_args, constant_args):
     """
     Args:
         self: the class we are handling
-        model_args (dict): var_name to var_value
-            used to make instances
+        model_args (dict/None): var_name to var_value
+            The input data, e.g. the payload that must match at least one
+            anyOf child schema in the OpenAPI document. If the input data
+            is the null value, model_args is None.
         constant_args (dict): var_name to var_value
-            used to make instances
+            args that every model requires, including configuration, server
+            and path to item.
 
     Returns
         anyof_instances (list)
@@ -1305,6 +1316,13 @@ def get_anyof_instances(self, model_args, constant_args):
         return anyof_instances
 
     for anyof_class in self._composed_schemas()['anyOf']:
+        if anyof_class is none_type:
+            # The only way the input data can match the 'None' type
+            # is if the input data is the 'null' value.
+            if model_args is None:
+                # The input data matches the 'None' type.
+                anyof_instances.append(model_args)
+            continue
         # transform js keys to python keys in fixed_model_args
         fixed_model_args = change_keys_js_to_python(model_args, anyof_class)
 

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

@@ -196,5 +196,6 @@ def _composed_schemas():
           'oneOf': [
               apple_req.AppleReq,
               banana_req.BananaReq,
+              none_type,
           ],
         }

samples/openapi3/client/petstore/python-experimental/test/test_fruit_req.py

@@ -70,6 +70,7 @@ def testFruitReq(self):
                 'oneOf': [
                     petstore_api.AppleReq,
                     petstore_api.BananaReq,
+                    type(None),
                 ],
             }
         )