Change converted LUT format

Author: jacob720

src/daq_config_server/converters/_converter_utils.py

@@ -26,21 +26,27 @@ def parse_value(value: str, convert_to: type | None = None) -> Any:
 
 def parse_lut_to_dict(
     contents: str,
-    *params: tuple[str, str, type | None],
-) -> dict[str, dict[str, str] | list[dict[str, Any]]]:
-    data: list[dict[str, Any]] = []
+    *params: tuple[str, type | None],
+) -> dict[str, list[str] | list[list[Any]]]:
+    """Converts a lookup table to a dict, containing the names of each column and
+    the rows as a 2D list.
+
+    Any args after the contents should be a tuple of (column name, type | None).
+    If a type is provided, the values in that column will be converted to that type.
+    Otherwise, the type will be inferred. Please include units in the column name.
+    """
+    data: list[list[Any]] = []
+    column_names = [param[0] for param in params]
+    types = [param[1] for param in params]
     data_dict = {
-        "units": {key: unit for param in params for key, unit in [param[:2]]},
+        "column_names": column_names,
         "data": data,
     }
     for line in remove_comments(contents.splitlines()):
         if line.startswith("Units"):
             continue
         data.append(
-            {
-                params[i][0]: parse_value(value, params[i][2])
-                for i, value in enumerate(line.split())
-            }
+            [parse_value(value, types[i]) for i, value in enumerate(line.split())]
         )
     data_dict["data"] = data
     return data_dict

src/daq_config_server/converters/_converters.py

@@ -85,23 +85,21 @@ def xml_to_dict(contents: str) -> dict[str, Any]:
 def detector_xy_lut_to_dict(contents: str):
     return parse_lut_to_dict(
         contents,
-        ("detector_distances", "mm", float),
-        ("beam_centre_x", "mm", float),
-        ("beam_centre_y", "mm", float),
+        ("detector_distances_mm", float),
+        ("beam_centre_x_mm", float),
+        ("beam_centre_y_mm", float),
     )
 
 
 def beamline_pitch_lut_to_dict(contents: str):
     return parse_lut_to_dict(
-        contents, ("bragg_angle", "degrees", float), ("pitch", "mrad", float)
+        contents, ("bragg_angle_deg", float), ("pitch_mrad", float)
     )
 
 
 def beamline_roll_lut_to_dict(contents: str):
-    return parse_lut_to_dict(
-        contents, ("bragg_angle", "degrees", float), ("roll", "mrad", float)
-    )
+    return parse_lut_to_dict(contents, ("bragg_angle_deg", float), ("roll_mrad", float))
 
 
 def undulator_energy_gap_lut_to_dict(contents: str):
-    return parse_lut_to_dict(contents, ("energy", "eV", int), ("gap", "mm", float))
+    return parse_lut_to_dict(contents, ("energy_eV", int), ("gap_mm", float))

tests/unit_tests/test_converters.py

@@ -43,30 +43,11 @@ def test_parse_lut_to_dict_gives_expected_result_and_can_be_jsonified():
     with open(TestDataPaths.TEST_GOOD_LUT_PATH) as f:
         contents = f.read()
     expected = {
-        "units": {
-            "energy": "eV",
-            "gap": "mm",
-        },
-        "data": [
-            {
-                "energy": 5700,
-                "gap": 5.4606,
-            },
-            {
-                "energy": 5760,
-                "gap": 5.5,
-            },
-            {
-                "energy": 6000,
-                "gap": 5.681,
-            },
-            {
-                "energy": 6500,
-                "gap": 6.045,
-            },
-        ],
+        "column_names": ["energy_eV", "gap_mm"],
+        "data": [[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
     }
-    result = parse_lut_to_dict(contents, ("energy", "eV", int), ("gap", "mm", float))
+    result = parse_lut_to_dict(contents, ("energy_eV", int), ("gap_mm", float))
+    print(result)
     assert result == expected
     json.dumps(result)
 
@@ -75,7 +56,7 @@ def test_parsing_bad_lut_causes_error():
     with open(TestDataPaths.TEST_BAD_LUT_PATH) as f:
         contents = f.read()
     with pytest.raises(IndexError):
-        parse_lut_to_dict(contents, ("energy", "eV", int), ("gap", "mm", float))
+        parse_lut_to_dict(contents, ("energy_eV", int), ("gap_mm", float))
 
 
 def test_display_config_to_dict_gives_expected_result_and_can_be_jsonified():