omegaconf 2.4.0.dev11__tar.gz → 2.4.0.dev12__tar.gz

{omegaconf-2.4.0.dev11/omegaconf.egg-info → omegaconf-2.4.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev11
+Version: 2.4.0.dev12
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
@@ -57,7 +57,7 @@ Dynamic: summary
 | 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://dl.circleci.com/status-badge/img/gh/omry/omegaconf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/omry/omegaconf/tree/main)[![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.3_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)[![Zulip chat](https://img.shields.io/badge/chat-Zulip-2e77d0?logo=zulip)](https://hydra-framework.zulipchat.com/)|
-| Backlog | [Issues & PRs backlog](https://omry.github.io/omegaconf/) |
+| Backlog | [![Backlog Atlas dashboard](https://omry.github.io/backlog-atlas/badge.svg)](https://omry.github.io/backlog-atlas/) |
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/README.md

@@ -4,7 +4,7 @@
 | 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://dl.circleci.com/status-badge/img/gh/omry/omegaconf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/omry/omegaconf/tree/main)[![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.3_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)[![Zulip chat](https://img.shields.io/badge/chat-Zulip-2e77d0?logo=zulip)](https://hydra-framework.zulipchat.com/)|
-| Backlog | [Issues & PRs backlog](https://omry.github.io/omegaconf/) |
+| Backlog | [![Backlog Atlas dashboard](https://omry.github.io/backlog-atlas/badge.svg)](https://omry.github.io/backlog-atlas/) |
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/_utils.py

@@ -340,6 +340,7 @@ def get_attr_class_fields(obj: Any) -> List["AttrAttribute[Any]"]:
 
 
 def get_attr_data(obj: Any, allow_objects: Optional[bool] = None) -> Dict[str, Any]:
+    from omegaconf.base import Node
     from omegaconf.omegaconf import OmegaConf, _maybe_wrap
 
     flags = {"allow_objects": allow_objects} if allow_objects is not None else {}
@@ -377,6 +378,8 @@ def get_attr_data(obj: Any, allow_objects: Optional[bool] = None) -> Dict[str, A
                 value = default.factory()
             else:
                 value = default
+        if isinstance(value, Node):
+            value = copy.deepcopy(value)
         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_)}"  # noqa: E231
@@ -410,6 +413,7 @@ def get_dataclass_fields(obj: Any) -> List["dataclasses.Field[Any]"]:
 def get_dataclass_data(
     obj: Any, allow_objects: Optional[bool] = None
 ) -> Dict[str, Any]:
+    from omegaconf.base import Node
     from omegaconf.omegaconf import MISSING, OmegaConf, _maybe_wrap
 
     flags = {"allow_objects": allow_objects} if allow_objects is not None else {}
@@ -435,6 +439,8 @@ def get_dataclass_data(
                 value = field.default_factory()  # type: ignore
             else:
                 value = MISSING
+        if isinstance(value, Node):
+            value = copy.deepcopy(value)
 
         if is_union_annotation(type_) and not is_supported_union_annotation(type_):
             e = ConfigValueError(
@@ -747,7 +753,10 @@ def get_dict_key_value_types(ref_type: Any) -> Tuple[Any, Any]:
     if args is None:
         bases = getattr(ref_type, "__orig_bases__", None)
         if bases is not None and len(bases) > 0:
-            args = getattr(bases[0], "__args__", None)
+            for base in bases:
+                if is_dict_annotation(base):
+                    args = getattr(base, "__args__", None)
+                    break
 
     key_type: Any
     element_type: Any
@@ -755,7 +764,7 @@ def get_dict_key_value_types(ref_type: Any) -> Tuple[Any, Any]:
         key_type = Any
         element_type = Any
     else:
-        if args is not None:
+        if args is not None and len(args) == 2:
             key_type = args[0]
             element_type = args[1]
         else:
@@ -829,12 +838,16 @@ def get_type_hint(obj: Any, key: Any = None) -> Optional[Type[Any]]:
         return Any  # type: ignore
 
 
-def _raise(ex: Exception, cause: Exception) -> None:
+def _is_full_backtrace_enabled() -> bool:
     # Set the environment variable OC_CAUSE=1 to get a stacktrace that includes the
     # causing exception.
     env_var = os.environ["OC_CAUSE"] if "OC_CAUSE" in os.environ else None
     debugging = sys.gettrace() is not None
-    full_backtrace = (debugging and not env_var == "0") or (env_var == "1")
+    return (debugging and not env_var == "0") or (env_var == "1")
+
+
+def _raise(ex: Exception, cause: Exception) -> None:
+    full_backtrace = _is_full_backtrace_enabled()
     if full_backtrace:
         # In the alias case (`cause is ex`), assigning `ex.__cause__ = cause`
         # would create a self-reference cycle that pins `ex` (and transitively
@@ -845,9 +858,12 @@ def _raise(ex: Exception, cause: Exception) -> None:
     else:
         ex.__cause__ = None
     try:
-        raise ex.with_traceback(
-            sys.exc_info()[2]
-        )  # set env var OC_CAUSE=1 for full trace
+        # Set env var OC_CAUSE=1 for full trace. In normal mode, avoid
+        # preserving the active traceback because it can retain caller frame
+        # locals until cyclic GC runs.
+        if full_backtrace:
+            raise ex.with_traceback(sys.exc_info()[2])
+        raise ex.with_traceback(None) from None
     finally:
         # Follow https://peps.python.org/pep-3110/ to break
         # the exception reference cycle.

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/base.py

@@ -22,6 +22,7 @@ from ._utils import (
     NoneType,
     ValueKind,
     _get_value,
+    _is_full_backtrace_enabled,
     _is_interpolation,
     _is_missing_value,
     _is_special,
@@ -42,6 +43,7 @@ from .errors import (
     InterpolationToMissingValueError,
     InterpolationValidationError,
     MissingMandatoryValue,
+    OmegaConfBaseException,
     UnsupportedInterpolationType,
     ValidationError,
 )
@@ -238,6 +240,17 @@ class Node(ABC):
         msg: Optional[str] = None,
         type_override: Any = None,
     ) -> NoReturn:
+        if (
+            type_override is None
+            and isinstance(cause, OmegaConfBaseException)
+            and cause._initialized
+        ):
+            if not _is_full_backtrace_enabled():
+                cause.__traceback__ = None
+                cause.__context__ = None
+            # Keep the re-raise in this common wrapper so callers do not need
+            # to remember traceback cleanup before forwarding OmegaConf errors.
+            raise
         format_and_raise(
             node=self,
             key=key,
@@ -690,6 +703,7 @@ class Container(Box):
         resolved_node_cache: Optional[Dict[int, "Node"]] = None,
     ) -> "Node":
         """A node interpolation is of the form `${foo.bar}`"""
+        original_inter_key = inter_key
         try:
             root_node, inter_key = self._resolve_key_and_root(inter_key)
         except ConfigKeyError as exc:
@@ -711,7 +725,19 @@ class Container(Box):
             ).with_traceback(sys.exc_info()[2])
 
         if parent is None or value is None:
-            raise InterpolationKeyError(f"Interpolation key '{inter_key}' not found")
+            msg = f"Interpolation key '{inter_key}' not found"
+            if original_inter_key != inter_key:
+                try:
+                    resolved_inter_key = root_node._get_full_key(inter_key)
+                except Exception as exc:
+                    resolved_inter_key = (
+                        f"<unresolvable due to {type(exc).__name__}: {exc}>"
+                    )
+                msg = (
+                    f"Interpolation key '{original_inter_key}' not found"
+                    f" (resolved to '{resolved_inter_key}')"
+                )
+            raise InterpolationKeyError(msg)
         else:
             self._validate_not_dereferencing_to_parent(node=self, target=value)
             return value

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/basecontainer.py

@@ -359,6 +359,7 @@ class BaseContainer(Container, ABC):
         dest: "BaseContainer",
         src: "BaseContainer",
         list_merge_mode: ListMergeMode = ListMergeMode.REPLACE,
+        _allow_readonly_target: bool = False,
     ) -> None:
         """merge src into dest and return a new copy, does not modified input"""
         from omegaconf import AnyNode, DictConfig, ValueNode
@@ -465,6 +466,7 @@ class BaseContainer(Container, ABC):
                         dest_node._merge_with(
                             src_node,
                             list_merge_mode=list_merge_mode,
+                            _allow_readonly_target=_allow_readonly_target,
                         )
                     elif not src_node_missing:
                         dest.__setitem__(key, src_node)
@@ -581,6 +583,7 @@ class BaseContainer(Container, ABC):
             "BaseContainer", Dict[str, Any], List[Any], Tuple[Any, ...], Any
         ],
         list_merge_mode: ListMergeMode = ListMergeMode.REPLACE,
+        _allow_readonly_target: bool = False,
     ) -> None:
         from .dictconfig import DictConfig
         from .listconfig import ListConfig
@@ -594,21 +597,35 @@ class BaseContainer(Container, ABC):
             if self._get_flag("allow_objects") is True:
                 my_flags = {"allow_objects": True}
             other = _ensure_container(other, flags=my_flags)
+            prev_readonly = self._get_node_flag("readonly")
 
-            if isinstance(self, DictConfig) and isinstance(other, DictConfig):
-                BaseContainer._map_merge(
-                    self,
-                    other,
-                    list_merge_mode=list_merge_mode,
-                )
-            elif isinstance(self, ListConfig) and isinstance(other, ListConfig):
-                BaseContainer._list_merge(
-                    self,
-                    other,
-                    list_merge_mode=list_merge_mode,
-                )
-            else:
-                raise TypeError("Cannot merge DictConfig with ListConfig")
+            readonly_overridden = (
+                _allow_readonly_target and self._get_flag("readonly") is True
+            )
+            if readonly_overridden:
+                # Non-public merge construction may target readonly containers.
+                # Temporarily relax them without changing merge_with() semantics.
+                self._set_flag("readonly", False)
+
+            try:
+                if isinstance(self, DictConfig) and isinstance(other, DictConfig):
+                    BaseContainer._map_merge(
+                        self,
+                        other,
+                        list_merge_mode=list_merge_mode,
+                        _allow_readonly_target=_allow_readonly_target,
+                    )
+                elif isinstance(self, ListConfig) and isinstance(other, ListConfig):
+                    BaseContainer._list_merge(
+                        self,
+                        other,
+                        list_merge_mode=list_merge_mode,
+                    )
+                else:
+                    raise TypeError("Cannot merge DictConfig with ListConfig")
+            finally:
+                if readonly_overridden:
+                    self._set_flag("readonly", prev_readonly)
 
         # recursively correct the parent hierarchy after the merge
         self._re_parent()
@@ -917,6 +934,19 @@ def _update_types(node: Node, ref_type: Any, object_type: Optional[type]) -> Non
         node._metadata.object_type = object_type
 
     if node._metadata.ref_type is Any:
+        new_is_optional, new_ref_type = _resolve_optional(ref_type)
+        if is_dict_annotation(new_ref_type) and is_structured_config(
+            node._metadata.object_type
+        ):
+            from ._utils import get_dict_key_value_types
+
+            assert isinstance(node._metadata, ContainerMetadata)
+            node._metadata.optional = new_is_optional
+            node._metadata.ref_type = new_ref_type
+            node._metadata.key_type, node._metadata.element_type = (
+                get_dict_key_value_types(new_ref_type)
+            )
+            return
         _deep_update_type_hint(node, ref_type)
 
 
@@ -972,17 +1002,24 @@ def _deep_update_type_hint(node: Node, type_hint: Any) -> None:
 
 def _deep_update_subnode(node: BaseContainer, key: Any, value_type_hint: Any) -> None:
     """Get node[key] and ensure it is compatible with value_type_hint, mutating if necessary."""
+    from .nodes import AnyNode
+
     subnode = node._get_node(key)
     assert isinstance(subnode, Node)
-    if _is_special(subnode) or (
-        is_union_annotation(value_type_hint)
-        and (
-            not isinstance(subnode, UnionNode)
-            or get_type_hint(subnode) != value_type_hint
+    _, ref_type = _resolve_optional(value_type_hint)
+    if (
+        _is_special(subnode)
+        or (isinstance(subnode, AnyNode) and ref_type is not Any)
+        or (
+            is_union_annotation(value_type_hint)
+            and (
+                not isinstance(subnode, UnionNode)
+                or get_type_hint(subnode) != value_type_hint
+            )
         )
     ):
-        # Ensure special values are wrapped in a Node subclass that
-        # is compatible with the type hint.
+        # Ensure dynamically typed or special values are wrapped in a Node
+        # subclass that is compatible with the type hint.
         node._wrap_value_and_set(key, subnode._value(), value_type_hint)
         subnode = node._get_node(key)
         assert isinstance(subnode, Node)

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/dictconfig.py

@@ -48,7 +48,6 @@ from .errors import (
     InterpolationResolutionError,
     KeyValidationError,
     MissingMandatoryValue,
-    OmegaConfBaseException,
     ReadonlyConfigError,
     ValidationError,
 )
@@ -344,8 +343,6 @@ class DictConfig(BaseContainer, MutableMapping[Any, Any]):
         try:
             self.__set_impl(key, value)
         except Exception as e:
-            if isinstance(e, OmegaConfBaseException) and e._initialized:
-                raise e
             self._format_and_raise(key=key, value=value, cause=e)
             assert False
 

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/listconfig.py

@@ -15,6 +15,7 @@ from typing import (
 
 from ._utils import (
     ValueKind,
+    _get_value,
     _is_missing_literal,
     _is_none,
     _resolve_optional,
@@ -512,9 +513,11 @@ class ListConfig(BaseContainer, MutableSequence[Any]):
             self.resolve = resolve
             self.iterator = iter(lst.__dict__["_content"])
             self.index = 0
+            from .base import UnionNode
             from .nodes import ValueNode
 
             self.ValueNode = ValueNode
+            self.UnionNode = UnionNode
 
         def __next__(self) -> Any:
             x = next(self.iterator)
@@ -526,6 +529,11 @@ class ListConfig(BaseContainer, MutableSequence[Any]):
             self.index = self.index + 1
             if isinstance(x, self.ValueNode):
                 return x._value()
+            elif self.resolve and isinstance(x, self.UnionNode):
+                # Resolved iteration mirrors indexing and yields the selected
+                # concrete value instead of leaking the UnionNode wrapper. The
+                # unresolved path keeps the node so copies preserve its type.
+                return _get_value(x)
             else:
                 # Must be omegaconf.Container. not checking for perf reasons.
                 if x._is_none():

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/omegaconf.py

@@ -109,13 +109,13 @@ def SI(interpolation: str) -> Any:
 def register_default_resolvers() -> None:
     from omegaconf.resolvers import oc
 
-    OmegaConf.register_new_resolver("oc.create", oc.create)
-    OmegaConf.register_new_resolver("oc.decode", oc.decode)
-    OmegaConf.register_new_resolver("oc.deprecated", oc.deprecated)
-    OmegaConf.register_new_resolver("oc.env", oc.env)
-    OmegaConf.register_new_resolver("oc.select", oc.select)
-    OmegaConf.register_new_resolver("oc.dict.keys", oc.dict.keys)
-    OmegaConf.register_new_resolver("oc.dict.values", oc.dict.values)
+    OmegaConf.register_resolver("oc.create", oc.create)
+    OmegaConf.register_resolver("oc.decode", oc.decode)
+    OmegaConf.register_resolver("oc.deprecated", oc.deprecated)
+    OmegaConf.register_resolver("oc.env", oc.env)
+    OmegaConf.register_resolver("oc.select", oc.select)
+    OmegaConf.register_resolver("oc.dict.keys", oc.dict.keys)
+    OmegaConf.register_resolver("oc.dict.values", oc.dict.values)
 
 
 class OmegaConf:
@@ -417,6 +417,9 @@ class OmegaConf:
         """
         Merge a list of previously created configs into a single one
 
+        Note for maintainers: changes to merge behavior should also consider
+        whether OmegaConf.unsafe_merge() needs the same coverage.
+
         :param configs: Input configs
         :param list_merge_mode: Behavior for merging lists
             REPLACE: Replaces the target list with the new one (default)
@@ -430,15 +433,11 @@ class OmegaConf:
         target = _ensure_container(target)
         assert isinstance(target, (DictConfig, ListConfig))
 
-        with flag_override(target, "readonly", False):
-            target.merge_with(
-                *configs[1:],
-                list_merge_mode=list_merge_mode,
-            )
-            turned_readonly = target._get_flag("readonly") is True
-
-        if turned_readonly:
-            OmegaConf.set_readonly(target, True)
+        target._merge_with(
+            *configs[1:],
+            list_merge_mode=list_merge_mode,
+            _allow_readonly_target=True,
+        )
 
         return target
 
@@ -475,9 +474,10 @@ class OmegaConf:
         with flag_override(
             target, ["readonly", "no_deepcopy_set_nodes"], [False, True]
         ):
-            target.merge_with(
+            target._merge_with(
                 *configs[1:],
                 list_merge_mode=list_merge_mode,
+                _allow_readonly_target=True,
             )
             turned_readonly = target._get_flag("readonly") is True
 
@@ -487,61 +487,7 @@ class OmegaConf:
         return target
 
     @staticmethod
-    def register_resolver(name: str, resolver: Resolver) -> None:
-        warnings.warn(
-            dedent("""\
-            register_resolver() is deprecated.
-            See https://github.com/omry/omegaconf/issues/426 for migration instructions.
-            """),
-            stacklevel=2,
-        )
-        return OmegaConf.legacy_register_resolver(name, resolver)
-
-    # This function will eventually be deprecated and removed.
-    @staticmethod
-    def legacy_register_resolver(name: str, resolver: Resolver) -> None:
-        assert callable(resolver), "resolver must be callable"
-        # noinspection PyProtectedMember
-        assert (
-            name not in BaseContainer._resolvers
-        ), f"resolver '{name}' is already registered"
-
-        def resolver_wrapper(
-            config: BaseContainer,
-            parent: BaseContainer,
-            node: Node,
-            args: Tuple[Any, ...],
-            args_str: Tuple[str, ...],
-        ) -> Any:
-            cache = OmegaConf.get_cache(config)[name]
-            # "Un-escape " spaces and commas.
-            args_unesc = [x.replace(r"\ ", " ").replace(r"\,", ",") for x in args_str]
-
-            # Nested interpolations behave in a potentially surprising way with
-            # legacy resolvers (they remain as strings, e.g., "${foo}"). If any
-            # input looks like an interpolation we thus raise an exception.
-            try:
-                bad_arg = next(i for i in args_unesc if "${" in i)
-            except StopIteration:
-                pass
-            else:
-                raise ValueError(
-                    f"Resolver '{name}' was called with argument '{bad_arg}' that appears "
-                    f"to be an interpolation. Nested interpolations are not supported for "
-                    f"resolvers registered with `[legacy_]register_resolver()`, please use "
-                    f"`register_new_resolver()` instead (see "
-                    f"https://github.com/omry/omegaconf/issues/426 for migration instructions)."  # noqa: E231
-                )
-            key = args_str
-            val = cache[key] if key in cache else resolver(*args_unesc)
-            cache[key] = val
-            return val
-
-        # noinspection PyProtectedMember
-        BaseContainer._resolvers[name] = resolver_wrapper
-
-    @staticmethod
-    def register_new_resolver(
+    def register_resolver(
         name: str,
         resolver: Resolver,
         *,
@@ -621,6 +567,76 @@ class OmegaConf:
         # noinspection PyProtectedMember
         BaseContainer._resolvers[name] = resolver_wrapper
 
+    @staticmethod
+    def register_new_resolver(
+        name: str,
+        resolver: Resolver,
+        *,
+        replace: bool = False,
+        use_cache: bool = False,
+    ) -> None:
+        warnings.warn(
+            dedent("""\
+            register_new_resolver() is deprecated and will be removed in a future release.
+            Use register_resolver() instead.
+            See https://github.com/omry/omegaconf/issues/426 for migration instructions.
+            """),
+            stacklevel=2,
+        )
+        return OmegaConf.register_resolver(
+            name, resolver, replace=replace, use_cache=use_cache
+        )
+
+    @staticmethod
+    def legacy_register_resolver(name: str, resolver: Resolver) -> None:
+        warnings.warn(
+            dedent("""\
+            legacy_register_resolver() is deprecated and will be removed in a future release.
+            Use register_resolver() instead.
+            See https://github.com/omry/omegaconf/issues/426 for migration instructions.
+            """),
+            stacklevel=2,
+        )
+        assert callable(resolver), "resolver must be callable"
+        # noinspection PyProtectedMember
+        assert (
+            name not in BaseContainer._resolvers
+        ), f"resolver '{name}' is already registered"
+
+        def resolver_wrapper(
+            config: BaseContainer,
+            parent: BaseContainer,
+            node: Node,
+            args: Tuple[Any, ...],
+            args_str: Tuple[str, ...],
+        ) -> Any:
+            cache = OmegaConf.get_cache(config)[name]
+            # "Un-escape " spaces and commas.
+            args_unesc = [x.replace(r"\ ", " ").replace(r"\,", ",") for x in args_str]
+
+            # Nested interpolations behave in a potentially surprising way with
+            # legacy resolvers (they remain as strings, e.g., "${foo}"). If any
+            # input looks like an interpolation we thus raise an exception.
+            try:
+                bad_arg = next(i for i in args_unesc if "${" in i)
+            except StopIteration:
+                pass
+            else:
+                raise ValueError(
+                    f"Resolver '{name}' was called with argument '{bad_arg}' that appears "
+                    f"to be an interpolation. Nested interpolations are not supported for "
+                    f"resolvers registered with `legacy_register_resolver()`, please use "
+                    f"`register_resolver()` instead (see "
+                    f"https://github.com/omry/omegaconf/issues/426 for migration instructions)."  # noqa: E231
+                )
+            key = args_str
+            val = cache[key] if key in cache else resolver(*args_unesc)
+            cache[key] = val
+            return val
+
+        # noinspection PyProtectedMember
+        BaseContainer._resolvers[name] = resolver_wrapper
+
     @classmethod
     def has_resolver(cls, name: str) -> bool:
         """
@@ -808,6 +824,25 @@ class OmegaConf:
             structured_config_mode=structured_config_mode,
         )
 
+    @staticmethod
+    def structural_equality(cfg1: Any, cfg2: Any) -> bool:
+        """
+        Compare two configs by their unresolved container structure.
+
+        This is equivalent to converting both configs with
+        ``OmegaConf.to_container(resolve=False, throw_on_missing=False)`` and
+        comparing the resulting containers. Interpolations and custom resolver
+        expressions are compared as their raw strings and are not resolved.
+        Missing values do not raise.
+
+        :param cfg1: First OmegaConf config to compare.
+        :param cfg2: Second OmegaConf config to compare.
+        :return: ``True`` if both configs have the same unresolved structure.
+        """
+        return OmegaConf.to_container(
+            cfg1, resolve=False, throw_on_missing=False
+        ) == OmegaConf.to_container(cfg2, resolve=False, throw_on_missing=False)
+
     @staticmethod
     def to_object(cfg: Any) -> Union[Dict[DictKeyType, Any], List[Any], None, str, Any]:
         """

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/omegaconf/version.py

@@ -1,6 +1,6 @@
 import sys  # pragma: no cover
 
-__version__ = "2.4.0.dev11"
+__version__ = "2.4.0.dev12"
 
 msg = """OmegaConf 2.4 and above is compatible with Python 3.10 and newer.
 You have the following options:

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12/omegaconf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omegaconf
-Version: 2.4.0.dev11
+Version: 2.4.0.dev12
 Summary: A flexible configuration library
 Home-page: https://github.com/omry/omegaconf
 Author: Omry Yadan
@@ -57,7 +57,7 @@ Dynamic: summary
 | 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://dl.circleci.com/status-badge/img/gh/omry/omegaconf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/omry/omegaconf/tree/main)[![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.3_branch/)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/omry/omegaconf/master?filepath=docs%2Fnotebook%2FTutorial.ipynb)[![Zulip chat](https://img.shields.io/badge/chat-Zulip-2e77d0?logo=zulip)](https://hydra-framework.zulipchat.com/)|
-| Backlog | [Issues & PRs backlog](https://omry.github.io/omegaconf/) |
+| Backlog | [![Backlog Atlas dashboard](https://omry.github.io/backlog-atlas/badge.svg)](https://omry.github.io/backlog-atlas/) |
 
 
 OmegaConf is a hierarchical configuration system, with support for merging configurations from multiple sources (YAML config files, dataclasses/objects and CLI arguments)

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/pyproject.toml

@@ -7,6 +7,7 @@ exclude = '''
     | omegaconf/grammar/gen
     | omegaconf/vendor
     | \.nox
+    | \.venv
     | build
     | subprojects
     | temp
@@ -17,15 +18,21 @@ exclude = '''
 '''
 
 [tool.isort]
-skip_glob = ["temp/*", "omegaconf/vendor/*", "subprojects/*", ".claude/*"]
+skip_glob = [
+    ".venv/*",
+    "temp/*",
+    "omegaconf/vendor/*",
+    "subprojects/*",
+    ".claude/*",
+]
 
 [tool.pytest.ini_options]
 addopts = "--import-mode=append -Werror"
 pythonpath = ["."]
-norecursedirs = ["subprojects", ".git", ".sl"]
+norecursedirs = ["subprojects", ".git", ".sl", ".venv"]
 
 [tool.bumpversion]
-current_version = "2.4.0.dev11"
+current_version = "2.4.0.dev12"
 parse = '''(?x)
     (?P<major>\d+)
     \.(?P<minor>\d+)
@@ -102,6 +109,7 @@ project-excludes = [
     "build/**",
     "temp/**",
     ".nox/**",
+    ".venv/**",
     "omegaconf/vendor/**",
     "subprojects/**",
 ]

{omegaconf-2.4.0.dev11 → omegaconf-2.4.0.dev12}/setup.cfg

@@ -4,7 +4,7 @@ test = pytest
 [flake8]
 max-line-length = 88
 extend-ignore = E203, E501
-exclude = .git,.eggs,.nox,build,temp,vendor,subprojects,omegaconf/grammar/gen,omegaconf/vendor
+exclude = .git,.eggs,.nox,.venv,build,temp,vendor,subprojects,omegaconf/grammar/gen,omegaconf/vendor
 
 [egg_info]
 tag_build =