Fix interpolation to structured config from within typed list (#1139)

omry · Nov 15, 2023 · c1333d7 · c1333d7
1 parent 0a0a6c6
commit c1333d7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/omegaconf/listconfig.py b/omegaconf/listconfig.py
@@ -106,6 +106,8 @@ def _validate_set(self, key: Any, value: Any) -> None:
         vk = get_value_kind(value)
         if vk == ValueKind.MANDATORY_MISSING:
             return
+        if vk == ValueKind.INTERPOLATION:
+            return
         else:
             is_optional, target_type = _resolve_optional(self._metadata.element_type)
             value_type = OmegaConf.get_type(value)

diff --git a/tests/structured_conf/data/attr_classes.py b/tests/structured_conf/data/attr_classes.py
@@ -76,6 +76,8 @@ class OptionalUser:
 class InterpolationToUser:
     user: User = User("Bond", 7)
     admin: User = II("user")
+    admin_list: List[User] = [II("user")]
+    admin_dict: Dict[str, User] = {"bond": II("user")}
 
 
 @attr.s(auto_attribs=True)

diff --git a/tests/structured_conf/data/dataclasses.py b/tests/structured_conf/data/dataclasses.py
@@ -77,6 +77,8 @@ class OptionalUser:
 class InterpolationToUser:
     user: User = field(default_factory=lambda: User("Bond", 7))
     admin: User = II("user")
+    admin_list: List[User] = field(default_factory=lambda: [II("user")])
+    admin_dict: Dict[str, User] = field(default_factory=lambda: {"bond": II("user")})
 
 
 @dataclass

diff --git a/tests/structured_conf/data/dataclasses_pre_311.py b/tests/structured_conf/data/dataclasses_pre_311.py
@@ -77,6 +77,8 @@ class OptionalUser:
 class InterpolationToUser:
     user: User = User("Bond", 7)
     admin: User = II("user")
+    admin_list: List[User] = field(default_factory=lambda: [II("user")])
+    admin_dict: Dict[str, User] = field(default_factory=lambda: {"bond": II("user")})
 
 
 @dataclass

diff --git a/tests/structured_conf/test_structured_basic.py b/tests/structured_conf/test_structured_basic.py
@@ -247,6 +247,10 @@ def test_interpolation_to_structured(self, module: Any, resolve: bool) -> None:
             OmegaConf.resolve(cfg)
         assert OmegaConf.get_type(cfg.admin) is module.User
         assert cfg.admin == {"name": "Bond", "age": 7}
+        assert OmegaConf.get_type(cfg.admin_list[0]) is module.User
+        assert cfg.admin_list == [{"name": "Bond", "age": 7}]
+        assert OmegaConf.get_type(cfg.admin_dict["bond"]) is module.User
+        assert cfg.admin_dict == {"bond": {"name": "Bond", "age": 7}}
 
     class TestMissing:
         def test_missing1(self, module: Any) -> None: