gooddata-api-client 1.73.1.dev2__py3-none-any.whl → 1.73.1.dev4__py3-none-any.whl

gooddata_api_client/__init__.py

@@ -11,7 +11,7 @@
 """
 
 
-__version__ = "1.73.1.dev2"
+__version__ = "1.73.1.dev4"
 
 # import ApiClient
 from gooddata_api_client.api_client import ApiClient

gooddata_api_client/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.73.1.dev2/python'
+        self.user_agent = 'OpenAPI-Generator/1.73.1.dev4/python'
 
     def __enter__(self):
         return self

gooddata_api_client/configuration.py

@@ -381,7 +381,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v0\n"\
-               "SDK Package Version: 1.73.1.dev2".\
+               "SDK Package Version: 1.73.1.dev4".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

gooddata_api_client/model_utils.py

@@ -120,6 +120,59 @@ def composed_model_input_classes(cls):
     return []
 
 
+def composed_oneof_members(cls):
+    """The oneOf/anyOf member classes of a composed model, () for other models."""
+    composed = getattr(cls, '_composed_schemas', None)
+    if not composed:
+        return ()
+    return tuple(composed.get('oneOf') or ()) + tuple(composed.get('anyOf') or ())
+
+
+def composed_union_types(cls, name):
+    """Union of the types the oneOf/anyOf members declare for property `name`.
+
+    openapi-generator flattens the oneOf members' properties into the composed
+    parent, but for a property that several members declare it keeps only the
+    last member's type. The parent then rejects payloads that are valid for
+    every other member - e.g. an LLM provider config whose `auth` is typed as
+    `OpenAiProviderAuth` alone cannot carry Bedrock or Azure Foundry auth.
+
+    Widening to the union loses no validation: the value is still checked
+    against the composed schemas themselves by validate_get_composed_info.
+
+    Returns () when no member declares `name`, so the caller keeps the
+    parent's own type.
+
+    A member is not necessarily a model: `oneOf: [$ref, {type: string}]` emits
+    `'oneOf': [Thing, str]`, and a primitive has no `openapi_types`, hence the
+    getattr fallback rather than a direct attribute read.
+    """
+    types = []
+    for member in composed_oneof_members(cls):
+        for member_type in getattr(member, 'openapi_types', {}).get(name, ()):
+            if member_type not in types:
+                types.append(member_type)
+    return tuple(types)
+
+
+def composed_union_allowed_values(cls, name):
+    """Union of the enum values the oneOf/anyOf members allow for `name`.
+
+    Same generator defect as composed_union_types: the flattened parent keeps
+    only the last member's enum, so a discriminator-like `type` property ends
+    up accepting exactly one of the variants and which one depends on the order
+    of the oneOf array in the OpenAPI document.
+
+    Returns {} when no member constrains `name`, so the caller falls back to
+    the parent's own allowed_values. Tolerates non-model members for the same
+    reason as composed_union_types.
+    """
+    merged = {}
+    for member in composed_oneof_members(cls):
+        merged.update(getattr(member, 'allowed_values', {}).get((name,), {}))
+    return merged
+
+
 class OpenApiModel(object):
     """The base class for all OpenAPIModels"""
 
@@ -132,7 +185,13 @@ class OpenApiModel(object):
         path_to_item.append(name)
 
         if name in self.openapi_types:
-            required_types_mixed = self.openapi_types[name]
+            # Widened from upstream: for a composed (oneOf/anyOf) model the
+            # generator flattens the members' properties into the parent but
+            # keeps only the last member's type, so the parent alone rejects
+            # payloads valid for every other member. See composed_union_types.
+            required_types_mixed = (
+                composed_union_types(type(self), name) or self.openapi_types[name]
+            )
         elif self.additional_properties_type is None:
             raise ApiAttributeError(
                 "{0} has no attribute '{1}'".format(
@@ -160,9 +219,15 @@ class OpenApiModel(object):
             value = validate_and_convert_types(
                 value, required_types_mixed, path_to_item, self._spec_property_naming,
                 self._check_type, configuration=self._configuration)
-        if (name,) in self.allowed_values:
+        # Widened from upstream for the same reason as required_types_mixed
+        # above: the flattened parent keeps only the last member's enum.
+        allowed_values = (
+            composed_union_allowed_values(type(self), name)
+            or self.allowed_values.get((name,))
+        )
+        if allowed_values:
             check_allowed_values(
-                self.allowed_values,
+                {(name,): allowed_values},
                 (name,),
                 value
             )
@@ -1469,6 +1534,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         if configuration is None or not configuration.discard_unknown_keys:
             raise get_type_error(input_value, path_to_item, valid_classes,
                                  key_type=key_type)
+    last_conversion_exc = None
     for valid_class in valid_classes_coercible:
         try:
             if issubclass(valid_class, OpenApiModel):
@@ -1480,11 +1546,14 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             return deserialize_primitive(input_value, valid_class,
                                          path_to_item)
         except (ApiTypeError, ApiValueError, ApiKeyError) as conversion_exc:
-            if must_convert:
-                raise conversion_exc
-            # if we have conversion errors when must_convert == False
-            # we ignore the exception and move on to the next class
+            # Upstream re-raises immediately when must_convert is True, which
+            # gives a property whose type came from a oneOf/anyOf union only
+            # one attempt: the first candidate class. Try them all and report
+            # the last failure only if none matched.
+            last_conversion_exc = conversion_exc
             continue
+    if must_convert and last_conversion_exc is not None:
+        raise last_conversion_exc
     # we were unable to convert, must_convert == False
     return input_value
 

{gooddata_api_client-1.73.1.dev2.dist-info → gooddata_api_client-1.73.1.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gooddata-api-client
-Version: 1.73.1.dev2
+Version: 1.73.1.dev4
 Summary: OpenAPI definition
 Home-page: 
 Author: GoodData (generated by OpenAPI Generator)
@@ -29,7 +29,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: v0
-- Package version: 1.73.1.dev2
+- Package version: 1.73.1.dev4
 - Build package: org.openapitools.codegen.languages.PythonPriorClientCodegen
 
 ## Requirements.

{gooddata_api_client-1.73.1.dev2.dist-info → gooddata_api_client-1.73.1.dev4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-gooddata_api_client/__init__.py,sha256=IgZwKCiNAXNkctVME-y8C1OX_JdG6DT6LXX-vbgnoBU,854
-gooddata_api_client/api_client.py,sha256=VP4e10ux9yl4sCniAZS-RGUgfAW48tnCz8Wyx26jmP0,39367
-gooddata_api_client/configuration.py,sha256=kyI8loIe-VEJKjXcQtgiTqK4qxcK50Vst3m6DifAC0g,16423
+gooddata_api_client/__init__.py,sha256=1iijnTYIxYfGgR93dZALYX8QKVEKNVIbF86Xs9esi88,854
+gooddata_api_client/api_client.py,sha256=2QW1MIBDhEdzDZYpRCwSFx6hSqWVzgwCQIP6ugjTe3w,39367
+gooddata_api_client/configuration.py,sha256=Xz7XBgmUYEfSqtVuXu8DE_IZ6UfYurBjPQawJb2rqwQ,16423
 gooddata_api_client/exceptions.py,sha256=J6doCDt25NmTb6YSHlJ4BsFkQHZWv2N1eX72ErUvDho,5140
-gooddata_api_client/model_utils.py,sha256=IKRK6b9aJgEzwhOXr9f0Ex-2o-XkAjt5e_dteIY8lPI,83597
+gooddata_api_client/model_utils.py,sha256=TEaHZzSB8wlIJAxgyxbLjbz8NOagPgpbNTfYo8auRgg,86801
 gooddata_api_client/rest.py,sha256=WGOL6Ak_bbh8UloQDwCN0wa7vTruFTEqVDzRI2mGvaE,14346
 gooddata_api_client/api/__init__.py,sha256=d4-I-rg3I5RVGk3F4nCuftIZi97CgDXTk8GjKYYbmhM,218
 gooddata_api_client/api/actions_api.py,sha256=l4uiZEoN1e02V0vYUmVtOYNkWFkbHP8cTnh4JpCZ9oE,786902
@@ -1551,8 +1551,8 @@ gooddata_api_client/model/workspace_users.py,sha256=Y8uJJ2RrK2-vvRJY4b09TxiPEcqi
 gooddata_api_client/model/workspace_widget_slides_template.py,sha256=RAr3KgKAIugvFnJAy7UdyF-VZD1cFgYmWJnHJk8VpLQ,12359
 gooddata_api_client/model/xliff.py,sha256=FoJBFqeiPuQAdE5Yeo3C4UB_SG7AovmasoQ5Ycgq6U4,12688
 gooddata_api_client/models/__init__.py,sha256=5flUmViyyQMoLP4QK9nNy6CcuN_5hyyVAyy4f2v8vJE,136823
-gooddata_api_client-1.73.1.dev2.dist-info/licenses/LICENSE.txt,sha256=TXcX7q0JaEM02DrmcvaMqNvU912yBiaQGzCA5rZlp0U,20163
-gooddata_api_client-1.73.1.dev2.dist-info/METADATA,sha256=bn5B44QwnABLZXaq8bVTxNC_PI6S72vUEh0xsmxQFpE,375604
-gooddata_api_client-1.73.1.dev2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-gooddata_api_client-1.73.1.dev2.dist-info/top_level.txt,sha256=GaZfT4qEz5cKY0eA2Iub4vcr6soTMJolR7uIRDfgpcU,20
-gooddata_api_client-1.73.1.dev2.dist-info/RECORD,,
+gooddata_api_client-1.73.1.dev4.dist-info/licenses/LICENSE.txt,sha256=TXcX7q0JaEM02DrmcvaMqNvU912yBiaQGzCA5rZlp0U,20163
+gooddata_api_client-1.73.1.dev4.dist-info/METADATA,sha256=K4OADCr1CdaTeAZTgv9e0VZe6Ojxdd2yOBK19JfDgmI,375604
+gooddata_api_client-1.73.1.dev4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+gooddata_api_client-1.73.1.dev4.dist-info/top_level.txt,sha256=GaZfT4qEz5cKY0eA2Iub4vcr6soTMJolR7uIRDfgpcU,20
+gooddata_api_client-1.73.1.dev4.dist-info/RECORD,,