Fix from_pydict

AdrienVannson · AdrienVannson · commit 3d44dc2772b2 · 2024-11-12T16:00:56.000+01:00
diff --git a/src/betterproto/__init__.py b/src/betterproto/__init__.py
@@ -1714,21 +1714,18 @@ def from_pydict(self: T, value: Mapping[str, Any]) -> T:
             if value[key] is not None:
                 if meta.proto_type == TYPE_MESSAGE:
                     v = getattr(self, field_name)
-                    if isinstance(v, list):
-                        cls = self._betterproto.cls_by_field[field_name]
+                    cls = self._betterproto.cls_by_field[field_name]
+                    if issubclass(cls, list):
                         for item in value[key]:
                             v.append(cls().from_pydict(item))
-                    elif isinstance(v, datetime):
+                    elif issubclass(cls, datetime):
                         v = value[key]
-                    elif isinstance(v, timedelta):
+                    elif issubclass(cls, timedelta):
                         v = value[key]
                     elif meta.wraps:
                         v = value[key]
                     else:
-                        raise NotImplementedError
-                        # NOTE: `from_pydict` mutates the underlying message, so no
-                        # assignment here is necessary.
-                        v.from_pydict(value[key])
+                        v = cls().from_pydict(value[key])
                 elif meta.map_types and meta.map_types[1] == TYPE_MESSAGE:
                     v = getattr(self, field_name)
                     cls = self._betterproto.cls_by_field[f"{field_name}.value"]
