#124: Fix eq fails if object contains unresolveable values

news/124.bugfix

@@ -0,0 +1 @@
+Fix eq fails if object contains unresolveable values

omegaconf/_utils.py

@@ -198,8 +198,10 @@ def get_value_kind(value: Any, return_match_list: bool = False) -> Any:
     :param return_match_list: True to return the match list as well
     :return: ValueKind
     """
-    if not isinstance(value, str):
-        return ValueKind.VALUE
+    from .nodes import ValueNode
+
+    if isinstance(value, ValueNode):
+        value = value.value()
 
     key_prefix = r"\${(\w+:)?"
     legal_characters = r"([\w\.%_ \\,-]*?)}"
@@ -217,6 +219,9 @@ def ret(
     if value == "???":
         return ret(ValueKind.MANDATORY_MISSING)
 
+    if not isinstance(value, str):
+        return ValueKind.VALUE
+
     match_list = list(re.finditer(key_prefix + legal_characters, value))
     if len(match_list) == 0:
         return ret(ValueKind.VALUE)

omegaconf/basecontainer.py

@@ -447,14 +447,26 @@ def _item_eq(
 
         v1 = c1.get_node(k1)
         v2 = c2.get_node(k2)
+        v1_kind = get_value_kind(v1)
+        v2_kind = get_value_kind(v2)
+
         if isinstance(v1, ValueNode):
             v1 = v1.value()
-            if isinstance(v1, str):
-                v1 = c1._resolve_single(v1)
         if isinstance(v2, ValueNode):
             v2 = v2.value()
-            if isinstance(v2, str):
-                v2 = c2._resolve_single(v2)
+
+        # special case for two interpolations. just compare them literally.
+        # This is helping in cases where the two interpolations are not resolvable
+        # but the objects are still considered equal.
+        if v1_kind in (
+            ValueKind.STR_INTERPOLATION,
+            ValueKind.INTERPOLATION,
+        ) and v2_kind in (ValueKind.STR_INTERPOLATION, ValueKind.INTERPOLATION):
+            return True
+        if isinstance(v1, str):
+            v1 = c1._resolve_single(v1)
+        if isinstance(v2, str):
+            v2 = c2._resolve_single(v2)
 
         if isinstance(v1, BaseContainer) and isinstance(v2, BaseContainer):
             if not BaseContainer._config_eq(v1, v2):

tests/structured_conf/test_config_eq.py

@@ -44,6 +44,9 @@
         # With interpolations
         ([10, "${0}"], [10, 10]),
         (dict(a=12, b="${a}"), dict(a=12, b=12)),
+        # With missing interpolation
+        ([10, "${0}"], [10, 10]),
+        (dict(a="${missing}"), dict(a="${missing}")),
     ],
 )
 def test_list_eq(l1: List[Any], l2: List[Any]) -> None: