FormulaAndFunctionQueryDefinition group_by is list of objects, not dicts by ddadamhooper · Pull Request #3768 · DataDog/datadog-api-client-python

ddadamhooper · 2026-07-13T13:35:58Z

Fixes bugs uncovered by DataDog/datadog-api-spec#5974 Test branch datadog-api-spec/test/adam.hooper/topology-widget-freshen-2

Behavior change

Solved two small parsing bugs:

`oneOf` matched both branches

Spotted during TopologyMapWidgetDefinition change.

After the schema change, TopologyMapWidgetDefinitionDataStreams has an attribute requests with each child a TopologyRequestDataStreams. And TopologyMapWidgetDefinitionServiceMap has an attribute requests with each child TopologyRequestServiceMap.

When parsing a service-map widget, we test both branches:

TopologyMapWidgetDefinitionServiceMap => succeeds, because its requests contains a valid TopologyRequestServiceMap
TopologyMapWidgetDefinitionDataStreams => succeeds in error, because its requests contains an invalid TopologyRequestDataStreams but that _unparsed wasn't propagated to the list.

Fix: propagate _unparsed so the list is marked unparsed.

Formula Events group-by lists failed to parse

Existing bug -- this is a breaking client-API change! It fixes another breaking client-API changed introduced in #3230.

#3230 (March 2026) introduced a regression: Formula Events group-by lists failed to parse.

What we wanted:

query.get_oneof_instance()          # -> FormulaAndFunctionEventQueryDefinition
query._unparsed                     # -> False

gb = query.get_oneof_instance().group_by
type(gb)                            # -> list
gb[0].facet                         # -> '@geo.country_iso_code'
gb[0].sort.order.value              # -> 'desc'

What we shipped:

query = <FormulaAndFunctionQueryDefinition>
query.get_oneof_instance()      # -> UnparsedObject   (not the real variant!)
query._unparsed                 # -> True             (but never surfaced)

gb = query.get_oneof_instance().group_by
type(gb)                        # -> list
gb                              # -> [{'facet': ..., 'limit': 250, 'sort': {...}}]  # raw dicts
gb[0].facet                     # -> AttributeError: 'dict' object has no attribute 'facet'

This is because the parser wouldn't accept oneOf where one branch is a list.

But we didn't see this error because we weren't propagating _unparsed correctly.

Fix: deserialize_model(): accept a list as a valid oneOf child.

TL;DR

Customer-facing change in this PR:

Parsing Dashboards API responses, formula group-by clauses WERE list-of-dicts, and are NOW list-of-objects. This fixes a regression.
Parsing AnyValue: previously we'd return UnparsedObject for any value except for a dict<str,str>. Now we return AnyValue. This fixes a longstanding bug.

Two related deserialization bugs surfaced when parsing the topology_map and geomap dashboard widgets: - ModelNormal.set_attribute only propagated _unparsed from list elements that were UnparsedObject instances, missing nested OpenApiModel instances that were themselves _unparsed. A topology_map request whose query carried a mismatched data_source enum could ambiguously satisfy both oneOf variants without being flagged. - allows_single_value_input skipped list oneOf branches, returning False for a ModelComposed such as FormulaAndFunctionEventQueryGroupByConfig (oneOf of a group-by list or a flat fields object). deserialize_model then splatted a list input into positional args, crashing ModelComposed.__init__; the TypeError was swallowed during matching and masked the failure once _unparsed propagation was fixed. Propagate _unparsed from nested models in lists, and treat a list oneOf branch as allowing single-value input so list inputs route through get_oneof_instance. Applied to both the generated model_utils.py and the generator template.

ddadamhooper · 2026-07-13T13:38:12Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e0bad42583

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ddadamhooper · 2026-07-13T17:49:54Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-07-13T17:49:59Z

View all feedbacks in Devflow UI.

2026-07-13 17:49:58 UTC ℹ️ Start processing command /merge

2026-07-13 17:50:05 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2026-07-13 18:12:51 UTC ⚠️ MergeQueue: This merge request was unqueued

adam.hooper@datadoghq.com unqueued this merge request

ddadamhooper · 2026-07-13T18:05:43Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 326bb385fd

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ddadamhooper · 2026-07-13T19:34:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 85501f8615

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ddadamhooper · 2026-07-14T14:12:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 805bd2885b

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ddadamhooper · 2026-07-14T14:38:17Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 376d22332a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ddadamhooper · 2026-07-14T19:06:17Z

@codex review

ddadamhooper requested review from a team as code owners July 13, 2026 13:35

ddadamhooper added the changelog/Fixed label Jul 13, 2026

ddadamhooper changed the title ~~Fix oneOf deserialization for composed models with a list branch~~ FormulaAndFunctionQueryDefinition group_by is list of objects, not dicts Jul 13, 2026

chatgpt-codex-connector Bot reviewed Jul 13, 2026

View reviewed changes

Comment thread src/datadog_api_client/model_utils.py

ddadamhooper added 2 commits July 13, 2026 10:45

Fail on list with some-valid, some-invalid elements

4262243

Add unit tests

326bb38

jack-edmonds-dd approved these changes Jul 13, 2026

View reviewed changes

gh-worker-dd-devflow-36fce6 Bot added the mergequeue-status: waiting label Jul 13, 2026

chatgpt-codex-connector Bot reviewed Jul 13, 2026

View reviewed changes

Comment thread src/datadog_api_client/model_utils.py Outdated

gh-worker-dd-devflow-36fce6 Bot added mergequeue-status: removed and removed mergequeue-status: waiting labels Jul 13, 2026

Allow empty list

85501f8

chatgpt-codex-connector Bot reviewed Jul 13, 2026

View reviewed changes

Comment thread src/datadog_api_client/model_utils.py Outdated

jack-edmonds-dd approved these changes Jul 13, 2026

View reviewed changes

AnyValue: parse empty array correctly

805bd28

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/datadog_api_client/model_utils.py Outdated

Fix logic typo

376d223

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/datadog_api_client/model_utils.py Outdated

Support parsing AnyValue

befb3e5

Uh oh!

Conversation

ddadamhooper commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Behavior change

oneOf matched both branches

Formula Events group-by lists failed to parse

TL;DR

Uh oh!

ddadamhooper commented Jul 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ddadamhooper commented Jul 13, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ddadamhooper commented Jul 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ddadamhooper commented Jul 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ddadamhooper commented Jul 14, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ddadamhooper commented Jul 14, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ddadamhooper commented Jul 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ddadamhooper commented Jul 13, 2026 •

edited

Loading

`oneOf` matched both branches

gh-worker-devflow-routing-ef8351 Bot commented Jul 13, 2026 •

edited

Loading