feat: improve resolving oneOf relationships

There was an issue resolving oneOf. A workaround was introduced some time ago, but it did not work for ExportDefinitionRequest. ExportDefinitionRequest was correctly matched, but it did not pass the assert, so it failed with the error that none oneOf could be used. Therefore, assert was extended for the use case when all model_kwargs are presented in oneof_class.openapi_types. This new condition and the old one should cover both cases.

JIRA: PSDK-209
risk: low

Author: hkad98

.openapi-generator/custom_templates/model_utils.mustache

@@ -1547,7 +1547,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                 # Workaround for missing OneOf schema support by the generator
                 # Checks if the defined schema is a subset of received model
                 # This way we can ensure forward-compatibility support of new fields in API
-                assert set(oneof_class.openapi_types.keys()) <= set(model_kwargs.keys())
+                assert len(set(model_kwargs.keys()).difference(set(oneof_class.openapi_types.keys()))) == 0 or set(oneof_class.openapi_types.keys()) <= set(model_kwargs.keys())
 
             else:
                 if issubclass(oneof_class, ModelSimple):

gooddata-api-client/gooddata_api_client/model_utils.py

@@ -1877,7 +1877,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                 # Workaround for missing OneOf schema support by the generator
                 # Checks if the defined schema is a subset of received model
                 # This way we can ensure forward-compatibility support of new fields in API
-                assert set(oneof_class.openapi_types.keys()) <= set(model_kwargs.keys())
+                assert len(set(model_kwargs.keys()).difference(set(oneof_class.openapi_types.keys()))) == 0 or set(oneof_class.openapi_types.keys()) <= set(model_kwargs.keys())
 
             else:
                 if issubclass(oneof_class, ModelSimple):