Fix python handling of primitive types in oneOfs (#621)

* Fix unparsed check on primitive types

* Fix logic

* Add test

* Regenerate client from commit 52f8e03 of spec repo

Co-authored-by: Thomas Hervé <[email protected]>
Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>

Author: 3 people

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-10-12 09:01:06.740298",
-            "spec_repo_commit": "06c7795"
+            "regenerated": "2021-10-14 09:42:22.698222",
+            "spec_repo_commit": "52f8e03"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-10-12 09:01:40.970217",
-            "spec_repo_commit": "06c7795"
+            "regenerated": "2021-10-14 09:43:03.256268",
+            "spec_repo_commit": "52f8e03"
         }
     }
 }

.generator/templates/api_client.mustache

@@ -208,12 +208,11 @@ class ApiClient(object):
 
         if not _preload_content:
             {{^tornado}}
-            return (return_data)
+            return return_data
             {{/tornado}}
             {{#tornado}}
             raise tornado.gen.Return(return_data)
             {{/tornado}}
-            return return_data
 
         # deserialize response data
         if response_type:

.generator/templates/model_utils.mustache

@@ -1651,9 +1651,13 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                     oneof_instance = oneof_class._from_openapi_data(**model_kwargs, **constant_kwargs)
                 else:
                     oneof_instance = oneof_class(**model_kwargs, **constant_kwargs)
+                if not oneof_instance._unparsed:
+                    oneof_instances.append(oneof_instance)
             else:
                 if issubclass(oneof_class, ModelSimple):
                     oneof_instance = oneof_class(model_arg, **constant_kwargs)
+                    if not oneof_instance._unparsed:
+                        oneof_instances.append(oneof_instance)
                 elif oneof_class in PRIMITIVE_TYPES:
                     oneof_instance = validate_and_convert_types(
                         model_arg,
@@ -1663,8 +1667,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                         constant_kwargs['_check_type'],
                         configuration=constant_kwargs['_configuration']
                     )
-            if not oneof_instance._unparsed:
-                oneof_instances.append(oneof_instance)
+                    oneof_instances.append(oneof_instance)
         except Exception:
             pass
     if len(oneof_instances) != 1:

src/datadog_api_client/v1/api_client.py

@@ -5,6 +5,7 @@
 from datadog_api_client.v1.model.synthetics_test_request import SyntheticsTestRequest
 from datadog_api_client.v1.model_utils import validate_and_convert_types
 from datadog_api_client.v1 import Configuration as Configuration
+from datadog_api_client.v2.model.logs_aggregate_response import LogsAggregateResponse
 from datadog_api_client.v2.model.logs_archive import LogsArchive
 from datadog_api_client.v2.model.logs_archive_destination import LogsArchiveDestination
 from datadog_api_client.v2.model_utils import validate_and_convert_types as validate_and_convert_types_v2
@@ -267,3 +268,12 @@ def test_unknown_nested_one_of():
     assert isinstance(deserialized_data.data.attributes.destination, LogsArchiveDestination)
     assert deserialized_data.data.attributes.destination.type == "A non existent destination"
     assert deserialized_data.data.attributes.destination._composed_instances[0]._unparsed
+
+
+def test_one_of_primitive_types():
+    body = """{"data": {"buckets": [{"by": {}, "computes": {"c0": 435.3}}]}}"""
+    config = ConfigurationV2()
+    deserialized_data = validate_and_convert_types_v2(
+        json.loads(body), (LogsAggregateResponse,), ["received_data"], True, True, config)
+    assert isinstance(deserialized_data, LogsAggregateResponse)
+    assert deserialized_data.data.buckets[0].computes["c0"] == 435.3