omry / omegaconf / c03f522d-b68f-41d8-8c34-b25aa759b1bc

100%

master: 100%

push

circleci

Defer interpolation resolution when merging into a structured config (#1020) (#1331)

* Defer interpolation resolution when merging into a structured config

Merging an interpolation into a structured-config field failed in two ways:
_map_merge eagerly resolved the source node via _is_none(resolve=True) (which
resolves the interpolation in the source's context, where the referenced keys
may not exist -> InterpolationKeyError) and validated its type via
_validate_merge (which rejected the raw '${...}' string as not a subclass of
the target type -> ValidationError).

An interpolation's type is unknown until resolution and must be resolved
lazily against the merged result, so skip both eager steps when the source
node is an interpolation and let it be assigned as-is.

Fixes #1020

* Rework #1020 test to reuse A/B/C fixtures; add news fragment

Reuse the existing A, B and C test fixtures instead of six single-use
dataclasses, and assert the structured type via OmegaConf.get_type
rather than indexing to_container (fixes the pyrefly failure).

---------

Co-authored-by: uttam12331 <uttam12331@users.noreply.github.com>

2 of 2 new or added lines in 1 file covered. (100.0%)

4246 of 4246 relevant lines covered (100.0%)

1.0 hits per line