Skip to content

Fix oneOf generation with mixed types including primitives #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2023
Merged

Fix oneOf generation with mixed types including primitives #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bf8b00
Fix early exit of oneOf generation with mixed types
nkzou Mar 8, 2023
0c285ad
pre-commit fixes
Mar 8, 2023
a5df63b
remove primitive check in case future oneOfs have other edge cases
nkzou Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .generator/src/generator/openapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ def child_models(schema, alternative_name=None, seen=None, in_list=False):
if "oneOf" in schema:
has_sub_models = True
for child in schema["oneOf"]:
# Don't generate models for nested primitive types
if in_list and child.get("type") in PRIMITIVE_TYPES:
return
yield from child_models(child, seen=seen)
if "anyOf" in schema:
has_sub_models = True
Expand Down
7 changes: 7 additions & 0 deletions docs/datadog_api_client.v1.model.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,13 @@ distribution\_point
:members:
:show-inheritance:

distribution\_point\_data
-------------------------

.. automodule:: datadog_api_client.v1.model.distribution_point_data
:members:
:show-inheritance:

distribution\_points\_content\_encoding
---------------------------------------

Expand Down
25 changes: 25 additions & 0 deletions src/datadog_api_client/v1/model/distribution_point_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
# This product includes software developed at Datadog (https://www.datadoghq.com/).
# Copyright 2019-Present Datadog, Inc.
from __future__ import annotations


from datadog_api_client.model_utils import (
ModelSimple,
cached_property,
)


class DistributionPointData(ModelSimple):
"""
Distribution point data.


:type value: [float]
"""

@cached_property
def openapi_types(_):
return {
"value": ([float],),
}
1 change: 1 addition & 0 deletions src/datadog_api_client/v1/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
from datadog_api_client.v1.model.dashboard_template_variable_preset_value import DashboardTemplateVariablePresetValue
from datadog_api_client.v1.model.deleted_monitor import DeletedMonitor
from datadog_api_client.v1.model.distribution_point import DistributionPoint
from datadog_api_client.v1.model.distribution_point_data import DistributionPointData
from datadog_api_client.v1.model.distribution_points_content_encoding import DistributionPointsContentEncoding
from datadog_api_client.v1.model.distribution_points_payload import DistributionPointsPayload
from datadog_api_client.v1.model.distribution_points_series import DistributionPointsSeries
Expand Down