fix bug with adding __class__ to list

quam/core/quam_classes.py

@@ -417,7 +417,8 @@ def to_dict(
                     follow_references=follow_references,
                     include_defaults=include_defaults,
                 )
-                if not self._val_matches_attr_annotation(attr, val):
+                val_is_list = isinstance(val, (list, UserList))
+                if not self._val_matches_attr_annotation(attr, val) and not val_is_list:
                     quam_dict[attr]["__class__"] = get_full_class_path(val)
             else:
                 quam_dict[attr] = val

quam/core/quam_instantiation.py

@@ -205,7 +205,11 @@ def instantiate_attr(
         )
         if typing.get_origin(expected_type) == dict:
             expected_type = dict
-    elif isinstance(expected_type, list) or typing.get_origin(expected_type) == list:
+    elif (
+        isinstance(expected_type, list)
+        or typing.get_origin(expected_type) == list
+        or isinstance(attr_val, list)
+    ):
         instantiated_attr = instantiate_attrs_from_list(
             attr_list=attr_val,
             required_type=expected_type,

tests/instantiation/test_instantiate_explicit_class.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import List, Union
 from quam.core import *
 from quam.core.quam_instantiation import *
 from quam.utils import get_full_class_path
@@ -25,3 +26,14 @@ def test_instantiate_from_class():
     assert type(loaded_explicit_component) == type(loaded_explicit_component2)
 
     assert isinstance(loaded_explicit_component, QuamComponentTest)
+
+
+def test_instantiate_nondefault_list_from_dict():
+    @quam_dataclass
+    class QuamBasicComponent(QuamComponent):
+        l: Union[int, List[int]] = 42
+
+    quam_component = QuamBasicComponent(l=[1, 2, 3])
+
+    d = quam_component.to_dict()
+    instantiate_quam_class(QuamBasicComponent, d)

tests/quam_base/test_quam_list.py

@@ -74,3 +74,8 @@ def test_list_get_attrs_error():
     quam_list = QuamList()
     with pytest.raises(NotImplementedError):
         quam_list.get_attrs()
+
+
+def test_list_to_dict():
+    quam_list = QuamList([1, 2, 3])
+    assert quam_list.to_dict() == [1, 2, 3]

tests/quam_base/test_to_dict.py

@@ -142,3 +142,12 @@ class QuamBasicComponent(QuamComponent):
 
     quam_component = QuamBasicComponent(l=[1, 2, 3])
     assert quam_component.to_dict() == {"l": [1, 2, 3]}
+
+
+def test_list_to_dict_nondefault():
+    @quam_dataclass
+    class QuamBasicComponent(QuamComponent):
+        l: int = 42
+
+    quam_component = QuamBasicComponent(l=[1, 2, 3])
+    assert quam_component.to_dict() == {"l": [1, 2, 3]}