Changed the logic to get the number of wells

Author: felipenarv

src/allotropy/parsers/constants.py

@@ -10,8 +10,19 @@
 POSSIBLE_WELL_COUNTS = [1, 2, 4, 6, 8, 12, 24, 48, 72, 96, 384, 1536, 3456]
 
 
-def round_to_nearest_well_count(well_count: int) -> int | None:
-    for possible_count in POSSIBLE_WELL_COUNTS:
+def round_to_nearest_well_count(
+    well_count: int, possible_well_counts: list[int] | None = None
+) -> int | None:
+    """
+    Round the well count to the nearest well count in the list of possible well counts. If a list
+    of possible well counts is not provided, use the default list of possible well counts.
+    If the well count is not in the list of possible well counts, return None.
+    """
+    well_counts = (
+        POSSIBLE_WELL_COUNTS if possible_well_counts is None else possible_well_counts
+    )
+    well_counts.sort()
+    for possible_count in well_counts:
         if well_count > possible_count:
             continue
         return possible_count

src/allotropy/parsers/luminex_xponent/luminex_xponent_reader.py

@@ -227,11 +227,12 @@ def add_mandatory_columns(
     def _get_well_count(df: pd.DataFrame) -> int:
         # Count unique values in WELL LOCATION matching Excel-like cell ids: Letter(s) + Number(s)
         # Example matches: A1, B12, AA3
+        accepted_well_counts = [96, 384]
         pattern = r"^[A-Za-z]+\d+$"
         values = df["WELL LOCATION"].astype(str).str.strip()
         matching = values[values.str.match(pattern)]
         unique_count = int(matching.str.upper().nunique())
-        nearest = round_to_nearest_well_count(unique_count)
+        nearest = round_to_nearest_well_count(unique_count, accepted_well_counts)
         return int(nearest or 0)
 
     @classmethod

tests/parsers/luminex_intelliflex/testdata/luminex_intelliflex_single_dataset.json

@@ -799,7 +799,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -1601,7 +1601,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -2403,7 +2403,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -3205,7 +3205,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -4007,7 +4007,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -4809,7 +4809,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -5611,7 +5611,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -6413,7 +6413,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -7215,7 +7215,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -8017,7 +8017,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -8819,7 +8819,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -9621,7 +9621,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }
@@ -10423,7 +10423,7 @@
                     ],
                     "container type": "well plate",
                     "plate well count": {
-                        "value": 24.0,
+                        "value": 96.0,
                         "unit": "#"
                     }
                 }