omegaconf 2.4.0.dev3__tar.gz → 2.4.0.dev8__tar.gz

omegaconf-2.4.0.dev8/PKG-INFO

@@ -0,0 +1,63 @@
+Metadata-Version: 2.4
+Name: omegaconf
+Version: 2.4.0.dev8
+Summary: A flexible configuration library
+Home-page: https://github.com/omry/omegaconf
+Author: Omry Yadan
+Author-email: omry@yadan.net
+Keywords: yaml configuration config
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: PyYAML>=5.1.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# OmegaConf
+|  | Description |
+| --- | --- |
+| Project | [![PyPI version](https://badge.fury.io/py/omegaconf.svg)](https://badge.fury.io/py/omegaconf)[![Downloads](https://pepy.tech/badge/omegaconf/month)](https://pepy.tech/project/omegaconf)![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue) |
+| Code quality| [![CircleCI](https://img.shields.io/circleci/build/github/omry/omegaconf?logo=s&token=5de2f8dc2a0dd78438520575431aa533150806e3)](https://circleci.com/gh/omry/omegaconf)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
+| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.1_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)|
+
+
+OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
+providing a consistent API regardless of how the configuration was created.
+
+## Optional subprojects
+
+- [`omegaconf-pydevd`](./subprojects/omegaconf-pydevd/README.md): optional `pydevd` debugger plugin for inspecting OmegaConf objects in supported debuggers.
+
+## Releases
+
+### Upcoming (2.4.0.dev)
+OmegaConf 2.4.0.dev is the upcoming development version.
+* [Documentation](https://omegaconf.readthedocs.io/en/latest/)
+* [Source code](https://github.com/omry/omegaconf/tree/master)
+
+### Stable (2.3)
+OmegaConf 2.3 is the current stable version.
+* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
+* [Documentation](https://omegaconf.readthedocs.io/en/2.3_branch/)
+* [Source code](https://github.com/omry/omegaconf/tree/2.3_branch)
+
+Install with `pip install --upgrade omegaconf`
+
+## Live tutorial
+Run the live tutorial: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)

omegaconf-2.4.0.dev8/README.md

@@ -0,0 +1,32 @@
+# OmegaConf
+|  | Description |
+| --- | --- |
+| Project | [![PyPI version](https://badge.fury.io/py/omegaconf.svg)](https://badge.fury.io/py/omegaconf)[![Downloads](https://pepy.tech/badge/omegaconf/month)](https://pepy.tech/project/omegaconf)![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue) |
+| Code quality| [![CircleCI](https://img.shields.io/circleci/build/github/omry/omegaconf?logo=s&token=5de2f8dc2a0dd78438520575431aa533150806e3)](https://circleci.com/gh/omry/omegaconf)[![Coverage Status](https://coveralls.io/repos/github/omry/omegaconf/badge.svg)](https://coveralls.io/github/omry/omegaconf)|
+| Docs and support |[![Documentation Status](https://readthedocs.org/projects/omegaconf/badge/?version=2.0_branch)](https://omegaconf.readthedocs.io/en/2.1_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)|
+
+
+OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)
+providing a consistent API regardless of how the configuration was created.
+
+## Optional subprojects
+
+- [`omegaconf-pydevd`](./subprojects/omegaconf-pydevd/README.md): optional `pydevd` debugger plugin for inspecting OmegaConf objects in supported debuggers.
+
+## Releases
+
+### Upcoming (2.4.0.dev)
+OmegaConf 2.4.0.dev is the upcoming development version.
+* [Documentation](https://omegaconf.readthedocs.io/en/latest/)
+* [Source code](https://github.com/omry/omegaconf/tree/master)
+
+### Stable (2.3)
+OmegaConf 2.3 is the current stable version.
+* [What's new](https://github.com/omry/omegaconf/releases/tag/v2.3.0)
+* [Documentation](https://omegaconf.readthedocs.io/en/2.3_branch/)
+* [Source code](https://github.com/omry/omegaconf/tree/2.3_branch)
+
+Install with `pip install --upgrade omegaconf`
+
+## Live tutorial
+Run the live tutorial: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/build_helpers/build_helpers.py

@@ -1,4 +1,3 @@
-import codecs
 import distutils.log
 import errno
 import os
@@ -64,26 +63,26 @@ class ANTLRCommand(Command):  # type: ignore  # pragma: no cover
         build_dir = Path(__file__).parent.absolute()
         project_root = build_dir.parent
         lib = "antlr4"
-        pkgname = 'omegaconf.vendor'
+        pkgname = "omegaconf.vendor"
 
         replacements = [
             partial(  # import antlr4 -> import omegaconf.vendor.antlr4
-                re.compile(r'(^\s*)import {}\n'.format(lib), flags=re.M).sub,
-                r'\1from {} import {}\n'.format(pkgname, lib)
+                re.compile(r"(^\s*)import {}\n".format(lib), flags=re.M).sub,
+                r"\1from {} import {}\n".format(pkgname, lib),
             ),
             partial(  # from antlr4 -> from fomegaconf.vendor.antlr4
-                re.compile(r'(^\s*)from {}(\.|\s+)'.format(lib), flags=re.M).sub,
-                r'\1from {}.{}\2'.format(pkgname, lib)
+                re.compile(r"(^\s*)from {}(\.|\s+)".format(lib), flags=re.M).sub,
+                r"\1from {}.{}\2".format(pkgname, lib),
             ),
         ]
 
         path = project_root / "omegaconf" / "grammar" / "gen"
         for item in path.iterdir():
             if item.is_file() and item.name.endswith(".py"):
-                text = item.read_text('utf8')
+                text = item.read_text("utf8")
                 for replacement in replacements:
                     text = replacement(text)
-                item.write_text(text, 'utf8')
+                item.write_text(text, "utf8")
 
 
 class BuildPyCommand(build_py.build_py):  # pragma: no cover
@@ -148,7 +147,7 @@ class DevelopCommand(develop.develop):  # pragma: no cover
 
 class SDistCommand(sdist.sdist):  # pragma: no cover
     def run(self) -> None:
-        if not self.dry_run:  # type: ignore
+        if not self.dry_run:  # type: ignore[attr-defined]
             self.run_command("clean")
             run_antlr(self)
         sdist.sdist.run(self)
@@ -196,7 +195,7 @@ def find(
 
 def find_version(*file_paths: str) -> str:
     root = Path(__file__).parent.parent.absolute()
-    with codecs.open(root / Path(*file_paths), "r") as fp:  # type: ignore
+    with open(root / Path(*file_paths), "r", encoding="utf-8") as fp:
         version_file = fp.read()
     version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
     if version_match:

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/_utils.py

@@ -114,6 +114,7 @@ _DEFAULT_MARKER_: Any = Marker("_DEFAULT_MARKER_")
 
 class OmegaConfDumper(BaseDumper):  # type: ignore
     str_representer_added = False
+    pathlib_representers_added = False
 
     @staticmethod
     def str_representer(dumper: yaml.Dumper, data: str) -> yaml.ScalarNode:
@@ -124,11 +125,51 @@ class OmegaConfDumper(BaseDumper):  # type: ignore
             style=("'" if with_quotes else None),
         )
 
+    @staticmethod
+    def pathlib_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.Path tag for cross-version compatibility
+        # Extract constructor args from __reduce__ and use sequence representation
+        return dumper.represent_sequence(  # pragma: no cover
+            "tag:yaml.org,2002:python/object/apply:pathlib.Path",
+            [str(data)],
+        )
+
+    @staticmethod
+    def pathlib_posix_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.PosixPath tag for cross-version compatibility
+        return dumper.represent_sequence(
+            "tag:yaml.org,2002:python/object/apply:pathlib.PosixPath",
+            [str(data)],
+        )
+
+    @staticmethod
+    def pathlib_windows_path_representer(dumper: yaml.Dumper, data: Any) -> yaml.Node:
+        # Use old pathlib.WindowsPath tag for cross-version compatibility
+        return dumper.represent_sequence(  # pragma: no cover
+            "tag:yaml.org,2002:python/object/apply:pathlib.WindowsPath",
+            [str(data)],
+        )
+
 
 def get_omega_conf_dumper() -> Type[OmegaConfDumper]:
     if not OmegaConfDumper.str_representer_added:
         OmegaConfDumper.add_representer(str, OmegaConfDumper.str_representer)
         OmegaConfDumper.str_representer_added = True
+
+    # Add representers for pathlib types to ensure cross-version compatibility.
+    # Python 3.13+ uses pathlib._local.* internally, so we normalize to old pathlib.* tags
+    if not OmegaConfDumper.pathlib_representers_added:
+        from pathlib import Path, PosixPath, WindowsPath
+
+        OmegaConfDumper.add_representer(Path, OmegaConfDumper.pathlib_path_representer)
+        OmegaConfDumper.add_representer(
+            PosixPath, OmegaConfDumper.pathlib_posix_path_representer
+        )
+        OmegaConfDumper.add_representer(
+            WindowsPath, OmegaConfDumper.pathlib_windows_path_representer
+        )
+        OmegaConfDumper.pathlib_representers_added = True
+
     return OmegaConfDumper
 
 
@@ -138,19 +179,72 @@ def yaml_is_bool(b: str) -> bool:
 
 def get_yaml_loader() -> Any:
     class OmegaConfLoader(BaseLoader):  # type: ignore
-        def construct_mapping(self, node: yaml.Node, deep: bool = False) -> Any:
-            keys = set()
-            for key_node, value_node in node.value:
+        def flatten_mapping(self, node: yaml.Node) -> Any:
+            merge_tag = "tag:yaml.org,2002:merge"
+            explicit_keys = set()
+            for key_node, _ in node.value:
+                if key_node.tag == merge_tag:
+                    continue
                 if key_node.tag != yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG:
                     continue
-                if key_node.value in keys:
+                if key_node.value in explicit_keys:
                     raise yaml.constructor.ConstructorError(
                         "while constructing a mapping",
                         node.start_mark,
                         f"found duplicate key {key_node.value}",
                         key_node.start_mark,
                     )
-                keys.add(key_node.value)
+                explicit_keys.add(key_node.value)
+
+            merge = []
+            index = 0
+            while index < len(node.value):
+                key_node, value_node = node.value[index]
+                if key_node.tag == merge_tag:
+                    del node.value[index]
+                    if isinstance(value_node, yaml.MappingNode):
+                        self.flatten_mapping(value_node)
+                        merge.extend(value_node.value)
+                    elif isinstance(value_node, yaml.SequenceNode):
+                        submerge = []
+                        for subnode in value_node.value:
+                            if not isinstance(subnode, yaml.MappingNode):
+                                raise yaml.constructor.ConstructorError(
+                                    "while constructing a mapping",
+                                    node.start_mark,
+                                    "expected a mapping for merging, but found "
+                                    f"{subnode.id}",
+                                    subnode.start_mark,
+                                )
+                            self.flatten_mapping(subnode)
+                            submerge.append(subnode.value)
+                        submerge.reverse()
+                        for value in submerge:
+                            merge.extend(value)
+                    else:
+                        raise yaml.constructor.ConstructorError(
+                            "while constructing a mapping",
+                            node.start_mark,
+                            "expected a mapping or list of mappings for merging, "
+                            f"but found {value_node.id}",
+                            value_node.start_mark,
+                        )
+                elif key_node.tag == "tag:yaml.org,2002:value":
+                    key_node.tag = yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG
+                    index += 1
+                else:
+                    index += 1
+
+            if merge:
+                merge = [
+                    (key_node, value_node)
+                    for key_node, value_node in merge
+                    if key_node.tag != yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG
+                    or key_node.value not in explicit_keys
+                ]
+                node.value = merge + node.value
+
+        def construct_mapping(self, node: yaml.Node, deep: bool = False) -> Any:
             return super().construct_mapping(node, deep=deep)
 
     loader = OmegaConfLoader
@@ -190,6 +284,20 @@ def get_yaml_loader() -> Any:
         lambda loader, node: pathlib.WindowsPath(*loader.construct_sequence(node)),
     )
 
+    # Python 3.13+ uses internal pathlib._local module
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.Path",
+        lambda loader, node: pathlib.Path(*loader.construct_sequence(node)),
+    )
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.PosixPath",
+        lambda loader, node: pathlib.PosixPath(*loader.construct_sequence(node)),
+    )
+    loader.add_constructor(
+        "tag:yaml.org,2002:python/object/apply:pathlib._local.WindowsPath",
+        lambda loader, node: pathlib.WindowsPath(*loader.construct_sequence(node)),
+    )
+
     return loader
 
 
@@ -350,7 +458,7 @@ def get_attr_data(obj: Any, allow_objects: Optional[bool] = None) -> Dict[str, A
                 value = MISSING
         if is_union_annotation(type_) and not is_supported_union_annotation(type_):
             e = ConfigValueError(
-                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"
+                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"  # noqa: E231
             )
             format_and_raise(node=None, key=None, value=value, cause=e, msg=str(e))
 
@@ -409,7 +517,7 @@ def get_dataclass_data(
 
         if is_union_annotation(type_) and not is_supported_union_annotation(type_):
             e = ConfigValueError(
-                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"
+                f"Unions of containers are not supported:\n{name}: {type_str(type_)}"  # noqa: E231
             )
             format_and_raise(node=None, key=None, value=value, cause=e, msg=str(e))
         try:
@@ -864,20 +972,16 @@ def format_and_raise(
     )
 
     if ref_type not in (None, Any):
-        template = dedent(
-            """\
+        template = dedent("""\
             $MSG
                 full_key: $FULL_KEY
                 reference_type=$REF_TYPE
-                object_type=$OBJECT_TYPE"""
-        )
+                object_type=$OBJECT_TYPE""")
     else:
-        template = dedent(
-            """\
+        template = dedent("""\
             $MSG
                 full_key: $FULL_KEY
-                object_type=$OBJECT_TYPE"""
-        )
+                object_type=$OBJECT_TYPE""")
     s = string.Template(template=template)
 
     message = s.substitute(
@@ -941,7 +1045,14 @@ def type_str(t: Any, include_module_name: bool = False) -> str:
             and t.__module__ != "typing"
             and not t.__module__.startswith("omegaconf.")
         ):
-            module_prefix = str(t.__module__) + "."
+            module_name = str(t.__module__)
+            if isinstance(t, type) and issubclass(t, pathlib.PurePath):
+                # Python 3.13+ uses pathlib._local internally, normalize to pathlib for # Path types
+                # Normalize pathlib._local to pathlib for cross-version compatibility
+                if module_name == "pathlib._local":  # pragma: no cover
+                    module_name = "pathlib"
+
+            module_prefix = module_name + "."
         else:
             module_prefix = ""
         ret = module_prefix + ret

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/base.py

@@ -248,16 +248,19 @@ class Node(ABC):
         self,
         throw_on_resolution_failure: bool = False,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         return self._dereference_node_impl(
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo,
+            resolved_node_cache=resolved_node_cache,
         )
 
     def _dereference_node_impl(
         self,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         if not self._is_interpolation():
             return self
@@ -278,6 +281,7 @@ class Node(ABC):
             parse_tree=parse(_get_value(self)),
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo,
+            resolved_node_cache=resolved_node_cache,
         )
 
     def _get_root(self) -> "Container":
@@ -456,6 +460,7 @@ class Container(Box):
         throw_on_missing: bool,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Tuple[Optional["Container"], Optional[str], Optional[Node]]:
         """
         Select a value using dot separated key sequence
@@ -482,6 +487,7 @@ class Container(Box):
                 ret = ret._maybe_dereference_node(
                     throw_on_resolution_failure=throw_on_resolution_failure,
                     memo=memo,
+                    resolved_node_cache=resolved_node_cache,
                 )
 
             if ret is not None and not isinstance(ret, Container):
@@ -506,12 +512,15 @@ class Container(Box):
         if value is None:
             return root, last_key, None
 
+        value_id = id(value)
+        if resolved_node_cache is not None and value_id in resolved_node_cache:
+            return root, last_key, resolved_node_cache[value_id]
+
         if memo is not None:
-            vid = id(value)
-            if vid in memo:
+            if value_id in memo:
                 raise InterpolationResolutionError("Recursive interpolation detected")
             # push to memo "stack"
-            memo.add(vid)
+            memo.add(value_id)
 
         try:
             value = root._maybe_resolve_interpolation(
@@ -520,11 +529,15 @@ class Container(Box):
                 value=value,
                 throw_on_resolution_failure=throw_on_resolution_failure,
                 memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         finally:
             if memo is not None:
                 # pop from memo "stack"
-                memo.remove(vid)
+                memo.remove(value_id)
+
+        if resolved_node_cache is not None and value is not None:
+            resolved_node_cache[value_id] = value
 
         return root, last_key, value
 
@@ -536,6 +549,7 @@ class Container(Box):
         parse_tree: OmegaConfGrammarParser.ConfigValueContext,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]],
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional["Node"]:
         """
         Resolve an interpolation.
@@ -568,7 +582,11 @@ class Container(Box):
 
         try:
             resolved = self.resolve_parse_tree(
-                parse_tree=parse_tree, node=value, key=key, memo=memo
+                parse_tree=parse_tree,
+                node=value,
+                key=key,
+                memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         except InterpolationResolutionError:
             if throw_on_resolution_failure:
@@ -636,7 +654,10 @@ class Container(Box):
             parent = parent._get_parent()
 
     def _resolve_node_interpolation(
-        self, inter_key: str, memo: Optional[Set[int]]
+        self,
+        inter_key: str,
+        memo: Optional[Set[int]],
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> "Node":
         """A node interpolation is of the form `${foo.bar}`"""
         try:
@@ -652,6 +673,7 @@ class Container(Box):
                 throw_on_missing=True,
                 throw_on_resolution_failure=True,
                 memo=memo,
+                resolved_node_cache=resolved_node_cache,
             )
         except MissingMandatoryValue as exc:
             raise InterpolationToMissingValueError(
@@ -696,6 +718,7 @@ class Container(Box):
         value: Node,
         throw_on_resolution_failure: bool,
         memo: Optional[Set[int]] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Optional[Node]:
         value_kind = get_value_kind(value)
         if value_kind != ValueKind.INTERPOLATION:
@@ -709,6 +732,7 @@ class Container(Box):
             parse_tree=parse_tree,
             throw_on_resolution_failure=throw_on_resolution_failure,
             memo=memo if memo is not None else set(),
+            resolved_node_cache=resolved_node_cache,
         )
 
     def resolve_parse_tree(
@@ -717,6 +741,7 @@ class Container(Box):
         node: Node,
         memo: Optional[Set[int]] = None,
         key: Optional[Any] = None,
+        resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> Any:
         """
         Resolve a given parse tree into its value.
@@ -728,7 +753,11 @@ class Container(Box):
         def node_interpolation_callback(
             inter_key: str, memo: Optional[Set[int]]
         ) -> Optional["Node"]:
-            return self._resolve_node_interpolation(inter_key=inter_key, memo=memo)
+            return self._resolve_node_interpolation(
+                inter_key=inter_key,
+                memo=memo,
+                resolved_node_cache=resolved_node_cache,
+            )
 
         def resolver_interpolation_callback(
             name: str, args: Tuple[Any, ...], args_str: Tuple[str, ...]

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/basecontainer.py

@@ -214,9 +214,13 @@ class BaseContainer(Container, ABC):
         throw_on_missing: bool,
         enum_to_str: bool = False,
         structured_config_mode: SCMode = SCMode.DICT,
+        resolved_node_cache: Optional[Dict[int, Node]] = None,
     ) -> Union[None, Any, str, Dict[DictKeyType, Any], List[Any]]:
         from omegaconf import MISSING, DictConfig, ListConfig
 
+        if resolve and resolved_node_cache is None:
+            resolved_node_cache = {}
+
         def convert(val: Node) -> Any:
             value = val._value()
             if enum_to_str and isinstance(value, Enum):
@@ -230,11 +234,26 @@ class BaseContainer(Container, ABC):
             except MissingMandatoryValue as e:
                 conf._format_and_raise(key=key, value=None, cause=e)
             assert isinstance(node, Node)
+            node_id = id(node)
             if resolve:
-                try:
-                    node = node._dereference_node()
-                except InterpolationResolutionError as e:
-                    conf._format_and_raise(key=key, value=None, cause=e)
+                cached = (
+                    resolved_node_cache.get(node_id)
+                    if resolved_node_cache is not None
+                    else None
+                )
+                if cached is not None:
+                    node = cached
+                else:
+                    try:
+                        node = node._maybe_dereference_node(
+                            throw_on_resolution_failure=True,
+                            resolved_node_cache=resolved_node_cache,
+                        )
+                    except InterpolationResolutionError as e:
+                        conf._format_and_raise(key=key, value=None, cause=e)
+                    assert node is not None
+                    if resolved_node_cache is not None:
+                        resolved_node_cache[node_id] = node
 
             if isinstance(node, Container):
                 value = BaseContainer._to_content(
@@ -243,6 +262,7 @@ class BaseContainer(Container, ABC):
                     throw_on_missing=throw_on_missing,
                     enum_to_str=enum_to_str,
                     structured_config_mode=structured_config_mode,
+                    resolved_node_cache=resolved_node_cache,
                 )
             else:
                 value = convert(node)
@@ -738,9 +758,9 @@ class BaseContainer(Container, ABC):
 
         def _slice_to_str(x: slice) -> str:
             if x.step is not None:
-                return f"{x.start}:{x.stop}:{x.step}"
+                return f"{x.start}:{x.stop}:{x.step}"  # noqa: E231
             else:
-                return f"{x.start}:{x.stop}"
+                return f"{x.start}:{x.stop}"  # noqa: E231
 
         def prepand(
             full_key: str,

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar/gen/OmegaConfGrammarLexer.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarLexer.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarLexer.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 from io import StringIO
 import sys

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar/gen/OmegaConfGrammarParser.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 # encoding: utf-8
 from omegaconf.vendor.antlr4 import *
 from io import StringIO

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar/gen/OmegaConfGrammarParserListener.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 if __name__ is not None and "." in __name__:
     from .OmegaConfGrammarParser import OmegaConfGrammarParser

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar/gen/OmegaConfGrammarParserVisitor.py

@@ -1,4 +1,4 @@
-# Generated from /home/homestar/dev/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
+# Generated from /home/runner/work/omegaconf/omegaconf/omegaconf/grammar/OmegaConfGrammarParser.g4 by ANTLR 4.11.1
 from omegaconf.vendor.antlr4 import *
 if __name__ is not None and "." in __name__:
     from .OmegaConfGrammarParser import OmegaConfGrammarParser

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar_parser.py

@@ -28,8 +28,10 @@ _node_inter = f"\\${{\\s*{_node_path}\\s*}}"  # node interpolation ${foo.bar}
 _id = "[a-zA-Z_][\\w\\-]*"  # foo, foo_bar, foo-bar, abc123
 _resolver_name = f"({_id}(\\.{_id})*)?"  # foo, ns.bar3, ns_1.ns_2.b0z
 _arg = r"[a-zA-Z_0-9/\-\+.$%*@?|]+"  # string representing a resolver argument
-_args = f"{_arg}(\\s*,\\s*{_arg})*"  # list of resolver arguments
-_resolver_inter = f"\\${{\\s*{_resolver_name}\\s*:\\s*{_args}?\\s*}}"  # ${foo:bar}
+_args = f"{_arg}(\\s*,\\s*{_arg})*"  # list of resolver arguments  # noqa: E231
+_resolver_inter = (
+    f"\\${{\\s*{_resolver_name}\\s*:\\s*{_args}?\\s*}}"  # ${foo:bar}  # noqa: E231
+)
 _inter = f"({_node_inter}|{_resolver_inter})"  # any kind of interpolation
 _outer = "([^$]|\\$(?!{))+"  # any character except $ (unless not followed by {)
 SIMPLE_INTERPOLATION_PATTERN = re.compile(

{omegaconf-2.4.0.dev3 → omegaconf-2.4.0.dev8}/omegaconf/grammar_visitor.py

@@ -251,7 +251,7 @@ class GrammarVisitor(OmegaConfGrammarParserVisitor):
             warnings.warn(
                 f"In the sequence `{txt}` some elements are missing: please replace "
                 f"them with empty quoted strings. "
-                f"See https://github.com/omry/omegaconf/issues/572 for details.",
+                f"See https://github.com/omry/omegaconf/issues/572 for details.",  # noqa: E231
                 category=UserWarning,
             )