Merge branch 'chuenchen309-fix/namedtuple-as-dict-default-key'

Author: Fatal1ty

mashumaro/core/meta/types/unpack.py

@@ -1073,7 +1073,7 @@ def unpack_named_tuple(spec: ValueSpec) -> Expression:
     }
     fields = getattr(spec.type, "_fields", ())
     defaults = getattr(spec.type, "_field_defaults", {})
-    unpackers = []
+    unpackers: dict[str, Expression] = {}
     as_dict = spec.builder.get_dialect_or_config_option(
         "namedtuple_as_dict", False
     )
@@ -1107,11 +1107,11 @@ def unpack_named_tuple(spec: ValueSpec) -> Expression:
                 could_be_none=True,
             )
         )
-        unpackers.append(unpacker)
+        unpackers[field] = unpacker
 
     if not defaults:
         field_type = spec.builder.get_type_name_identifier(spec.type)
-        return f"{field_type}({', '.join(unpackers)})"
+        return f"{field_type}({', '.join(unpackers.values())})"
 
     lines = CodeLines()
     method_name = (
@@ -1130,14 +1130,30 @@ def unpack_named_tuple(spec: ValueSpec) -> Expression:
         # we shouldn't be here because there will be default_kwargs
         lines.append(f"def {method_name}({method_args}):")
     with lines.indent():
-        lines.append("fields = []")
-        with lines.indent("try:"):
-            for unpacker in unpackers:
-                lines.append(f"fields.append({unpacker})")
-        with lines.indent("except IndexError:"):
-            lines.append("pass")
+        use_fields_list = not as_dict or len(fields) - len(defaults) > 0
+        if use_fields_list:
+            lines.append("fields_list = []")
+        if as_dict:
+            lines.append("fields_dict = {}")
+        if use_fields_list:
+            with lines.indent("try:"):
+                for field, unpacker in unpackers.items():
+                    if not as_dict or as_dict and field not in defaults:
+                        lines.append(f"fields_list.append({unpacker})")
+            with lines.indent("except IndexError:"):
+                lines.append("pass")
+        if as_dict:
+            for field, unpacker in unpackers.items():
+                if field in defaults:
+                    with lines.indent("try:"):
+                        lines.append(f"fields_dict['{field}'] = {unpacker}")
+                    with lines.indent("except KeyError:"):
+                        lines.append("pass")
         field_type = spec.builder.get_type_name_identifier(spec.type)
-        lines.append(f"return {field_type}(*fields)")
+        args = "*fields_list" if use_fields_list else ""
+        if as_dict:
+            args = ", ".join(filter(None, (args, "**fields_dict")))
+        lines.append(f"return {field_type}({args})")
     lines.append(
         f"setattr({spec.cls_attrs_name}, '{method_name}', {method_name})"
     )

tests/entities.py

@@ -273,6 +273,12 @@ class MyNamedTupleWithDefaults(NamedTuple):
     f: float = 2.0
 
 
+class MyNamedTupleWithRequiredAndDefaults(NamedTuple):
+    i: int
+    s: str = "default"
+    f: float = 42.0
+
+
 class MyNamedTupleWithOptional(NamedTuple):
     i: Optional[int]
     f: int

tests/test_config.py

@@ -14,6 +14,7 @@
     MyDataClassWithOptionalAndOmitNoneFlag,
     MyNamedTuple,
     MyNamedTupleWithDefaults,
+    MyNamedTupleWithRequiredAndDefaults,
     MyUntypedNamedTuple,
     MyUntypedNamedTupleWithDefaults,
     TypedDictRequiredKeys,
@@ -204,6 +205,62 @@ class Config(BaseConfig):
     assert DataClass.from_dict({"munpwd": {"i": 1, "f": 2.0}}) == obj
 
 
+def test_named_tuple_as_dict_with_missing_trailing_default_keys():
+    @dataclass
+    class DataClass(DataClassDictMixin):
+        mnpwd: MyNamedTupleWithDefaults
+        munpwd: MyUntypedNamedTupleWithDefaults
+        mnpwrd: MyNamedTupleWithRequiredAndDefaults
+
+        class Config(BaseConfig):
+            namedtuple_as_dict = True
+
+    # Omitting a key that has a default should fall back to that default,
+    # the same way an omitted trailing element does for the as_list engine.
+    obj = DataClass(
+        mnpwd=MyNamedTupleWithDefaults(i=10),
+        munpwd=MyUntypedNamedTupleWithDefaults(i=10),
+        mnpwrd=MyNamedTupleWithRequiredAndDefaults(i=10, s="sss"),
+    )
+    assert (
+        DataClass.from_dict(
+            {
+                "mnpwd": {"i": 10},
+                "munpwd": {"i": 10},
+                "mnpwrd": {"i": 10, "s": "sss"},
+            }
+        )
+        == obj
+    )
+
+
+def test_named_tuple_as_dict_with_missing_middle_default_keys():
+    @dataclass
+    class DataClass(DataClassDictMixin):
+        mnpwd: MyNamedTupleWithDefaults
+        munpwd: MyUntypedNamedTupleWithDefaults
+        mnpwrd: MyNamedTupleWithRequiredAndDefaults
+
+        class Config(BaseConfig):
+            namedtuple_as_dict = True
+
+    obj = DataClass(
+        mnpwd=MyNamedTupleWithDefaults(f=2.2),
+        munpwd=MyUntypedNamedTupleWithDefaults(f=2.2),
+        mnpwrd=MyNamedTupleWithRequiredAndDefaults(33, f=2.2),
+    )
+    assert (
+        DataClass.from_dict(
+            {
+                "mnpwd": {"f": 2.2},
+                "munpwd": {"f": 2.2},
+                "mnpwrd": {"i": 33, "f": 2.2},
+            }
+        )
+        == obj
+    )
+
+
 def test_named_tuple_as_dict_and_as_list_engine():
     @dataclass
     class DataClass(DataClassDictMixin):