in get_structured_config_data: check for dict subclass data

omegaconf/_utils.py

@@ -237,6 +237,23 @@ def get_attr_data(obj: Any, allow_objects: Optional[bool] = None) -> Dict[str, A
         except ValidationError as ex:
             format_and_raise(node=None, key=name, value=value, cause=ex, msg=str(ex))
         d[name]._set_parent(None)
+    if is_dict_subclass(obj_type) and not isinstance(obj, type):
+        key_type, element_type = get_dict_key_value_types(obj_type)
+        for name, value in obj.items():
+            is_optional, type_ = _resolve_optional(element_type)
+            type_ = _resolve_forward(type_, obj.__module__)
+            try:
+                d[name] = _maybe_wrap(
+                    ref_type=type_,
+                    is_optional=is_optional,
+                    key=name,
+                    value=value,
+                    parent=dummy_parent,
+                )
+            except ValidationError as ex:
+                format_and_raise(
+                    node=None, key=name, value=value, cause=ex, msg=str(ex)
+                )
     return d
 
 
@@ -248,7 +265,8 @@ def get_dataclass_data(
     flags = {"allow_objects": allow_objects} if allow_objects is not None else {}
     dummy_parent = OmegaConf.create({}, flags=flags)
     d = {}
-    resolved_hints = get_type_hints(get_type_of(obj))
+    obj_type = get_type_of(obj)
+    resolved_hints = get_type_hints(obj_type)
     for field in dataclasses.fields(obj):
         name = field.name
         is_optional, type_ = _resolve_optional(resolved_hints[field.name])
@@ -280,6 +298,23 @@ def get_dataclass_data(
         except ValidationError as ex:
             format_and_raise(node=None, key=name, value=value, cause=ex, msg=str(ex))
         d[name]._set_parent(None)
+    if is_dict_subclass(obj_type) and not isinstance(obj, type):
+        key_type, element_type = get_dict_key_value_types(obj_type)
+        for name, value in obj.items():
+            is_optional, type_ = _resolve_optional(element_type)
+            type_ = _resolve_forward(type_, obj.__module__)
+            try:
+                d[name] = _maybe_wrap(
+                    ref_type=type_,
+                    is_optional=is_optional,
+                    key=name,
+                    value=value,
+                    parent=dummy_parent,
+                )
+            except ValidationError as ex:
+                format_and_raise(
+                    node=None, key=name, value=value, cause=ex, msg=str(ex)
+                )
     return d
 
 

tests/structured_conf/data/attr_classes.py

@@ -408,6 +408,10 @@ class DictSubclass:
     class Str2Str(Dict[str, str]):
         pass
 
+    @attr.s(auto_attribs=True)
+    class Str2Int(Dict[str, int]):
+        pass
+
     @attr.s(auto_attribs=True)
     class Int2Str(Dict[int, str]):
         pass

tests/structured_conf/data/dataclasses.py

@@ -429,6 +429,10 @@ class DictSubclass:
     class Str2Str(Dict[str, str]):
         pass
 
+    @dataclass
+    class Str2Int(Dict[str, int]):
+        pass
+
     @dataclass
     class Int2Str(Dict[int, str]):
         pass

tests/structured_conf/test_structured_config.py

@@ -904,6 +904,18 @@ def test_str2str(self, module: Any) -> None:
         with raises(KeyValidationError):
             cfg[Color.RED]
 
+    def test_dict_subclass_data_preserved_upon_node_creation(self, module: Any) -> None:
+        src = module.DictSubclass.Str2Str()
+        src["baz"] = "qux"
+        cfg = OmegaConf.structured(src)
+        assert cfg.baz == "qux"
+
+    def test_create_dict_subclass_with_bad_value_type(self, module: Any) -> None:
+        src = module.DictSubclass.Str2Int()
+        src["baz"] = "qux"
+        with raises(ValidationError):
+            OmegaConf.structured(src)
+
     def test_str2str_as_sub_node(self, module: Any) -> None:
         cfg = OmegaConf.create({"foo": module.DictSubclass.Str2Str})
         assert OmegaConf.get_type(cfg.foo) == module.DictSubclass.Str2Str