Fix: Allow list tuples within Union to be instantiated properly

qua-platform · Jul 13, 2024 · 308c664 · 308c664
1 parent 2c79eaa
commit 308c664
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 39 deletions.
diff --git a/quam/core/quam_instantiation.py b/quam/core/quam_instantiation.py
@@ -105,48 +105,16 @@ def instantiate_attrs_from_list(
 
     instantiated_attr_list = []
     for k, attr_val in enumerate(attr_list):
-        if isinstance(attr_val, dict) and "__class__" in attr_val:
-            instantiated_attr = instantiate_quam_class(
-                get_class_from_path(attr_val["__class__"]),
-                attr_val,
+        instantiated_attr_list.append(
+            instantiate_attr(
+                attr_val=attr_val,
+                expected_type=required_subtype,
+                allow_none=False,
                 fix_attrs=fix_attrs,
-                validate_type=validate_type,
+                validate_type=validate_type if required_subtype is not None else False,
                 str_repr=f"{str_repr}[{k}]",
             )
-        elif not required_subtype:
-            instantiated_attr_list.append(attr_val)
-            continue
-        elif typing.get_origin(required_subtype) == list:
-            assert typing.get_origin(required_subtype) == list
-
-            instantiated_attr = instantiate_attrs_from_list(
-                attr_list=attr_val,
-                required_type=required_subtype,
-                fix_attrs=fix_attrs,
-                validate_type=validate_type,
-                str_repr=f"{str_repr}[{k}]",
-            )
-        elif not isclass(required_subtype):
-            instantiated_attr = attr_val
-        elif issubclass(required_subtype, QuamComponent):
-            if string_reference.is_reference(attr_val):
-                instantiated_attr = attr_val
-            else:
-                instantiated_attr = instantiate_quam_class(
-                    required_subtype,
-                    attr_val,
-                    fix_attrs=fix_attrs,
-                    validate_type=validate_type,
-                    str_repr=f"{str_repr}[{k}]",
-                )
-        else:
-            instantiated_attr = attr_val
-        # Add custom __class__ QuamComponent logic here
-        if required_subtype:
-            validate_obj_type(instantiated_attr, required_subtype, str_repr=str_repr)
-
-        instantiated_attr_list.append(instantiated_attr)
-
+        )
     return instantiated_attr_list
 
 

diff --git a/tests/instantiation/test_instantiation.py b/tests/instantiation/test_instantiation.py
@@ -376,3 +376,14 @@ class TestQuamUnion(QuamComponent):
 
     with pytest.raises(TypeError):
         instantiate_quam_class(TestQuamUnion, {"union_val": {"a": "42"}})
+
+
+def test_instantiation_nested_tuple():
+    @quam_dataclass
+    class NestedTupleComponent(QuamComponent):
+        nested_tuple: Union[List[Tuple[int, str]], List[Tuple[int]]]
+
+    instantiate_quam_class(
+        quam_class=NestedTupleComponent,
+        contents={"nested_tuple": [[1, "a"], [2, "b"]]},
+    )