Support int keys for QuamDict

quam/core/quam_classes.py

@@ -73,7 +73,7 @@ def convert_dict_and_list(value, cls_or_obj=None, attr=None):
     """Convert a dict or list to a QuamDict or QuamList if possible."""
     if isinstance(value, dict):
         value_annotation = _get_value_annotation(cls_or_obj=cls_or_obj, attr=attr)
-        return QuamDict(**value, value_annotation=value_annotation)
+        return QuamDict(value, value_annotation=value_annotation)
     elif type(value) == list:
         value_annotation = _get_value_annotation(cls_or_obj=cls_or_obj, attr=attr)
         return QuamList(value, value_annotation=value_annotation)

quam/utils/string_reference.py

@@ -79,10 +79,12 @@ def get_relative_reference_value(obj, string: str) -> Any:
         except KeyError as e:
             raise AttributeError(f"Object {obj} has no attribute {next_attr}") from e
     elif isinstance(obj, (dict, UserDict)):
-        try:
+        if next_attr in obj:
             obj_attr = obj[next_attr]
-        except KeyError as e:
-            raise AttributeError(f"Object {obj} has no attribute {next_attr}") from e
+        elif next_attr.isdigit() and int(next_attr) in obj:
+            obj_attr = obj[int(next_attr)]
+        else:
+            raise AttributeError(f"Object {obj} has no attribute {next_attr}")
     else:
         obj_attr = getattr(obj, next_attr)
 

tests/quam_base/referencing/test_referencing_dict.py

@@ -46,3 +46,17 @@ def test_referencing_to_dict():
     assert quam_root._get_referenced_value("#/quam_dict/a") == 44
     assert quam_root.quam_dict._get_referenced_value("#/quam_dict/a") == 44
     assert quam_root.quam_dict._get_referenced_value("#./a") == 44
+
+
+def test_referencing_dict_int_keys():
+    quam_root = BareQuamRoot()
+    quam_root.quam_dict = {"1": 1, 2: 2}
+
+    assert list(quam_root.quam_dict.keys()) == list(quam_root.quam_dict)
+    assert list(quam_root.quam_dict) == ["1", 2]
+
+    assert quam_root._get_referenced_value("#/quam_dict/1") == 1
+    assert quam_root.quam_dict._get_referenced_value("#/quam_dict/1") == 1
+
+    assert quam_root._get_referenced_value("#/quam_dict/2") == 2
+    assert quam_root.quam_dict._get_referenced_value("#/quam_dict/2") == 2

tests/quam_base/test_quam_dict.py

@@ -201,3 +201,13 @@ def test_dict_unreferenced_value():
     assert d.val1 == 42
     assert d.val2 == 42
     assert d.get_unreferenced_value("val1") == "#./val2"
+
+
+def test_quam_dict_int_keys():
+    quam_dict = QuamDict({1: 2})
+    assert quam_dict.data == {1: 2}
+    assert quam_dict[1] == 2
+    quam_dict.pop(1)
+    assert quam_dict.data == {}
+    with pytest.raises(KeyError):
+        quam_dict[1]