From bc8de32aff5e37728189822f41d4cf7161633722 Mon Sep 17 00:00:00 2001
From: Adrien Coulier <adrien.coulier@medsci.uu.se>
Date: Mon, 4 Dec 2023 16:29:34 +0100
Subject: [PATCH 1/2] Update NovaSeqX reagent recognizer

---
 checkQC/run_type_recognizer.py    | 12 ++++++++++--
 tests/test_run_type_recognizer.py | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/checkQC/run_type_recognizer.py b/checkQC/run_type_recognizer.py
index e41b032..36662b9 100644
--- a/checkQC/run_type_recognizer.py
+++ b/checkQC/run_type_recognizer.py
@@ -68,10 +68,18 @@ def reagent_version(runtype_recognizer):
         try:
             run_parameters = runtype_recognizer.run_parameters['RunParameters']
             consumables = run_parameters["ConsumableInfo"]["ConsumableInfo"]
-            reagent_version = next(
+            flowcell = next(
                 consumable for consumable in consumables
                 if consumable['Type'] == 'FlowCell'
-            )['Mode']
+            )
+
+            # "Mode" was used to specify the reagent version in the first runfolders that came out
+            # of the NovaSeqX. This is kept for backward compatibility.
+            reagent_version = flowcell.get("Name", flowcell.get("Mode"))
+
+            if not reagent_version:
+                raise KeyError
+
             return reagent_version
         except (KeyError, StopIteration):
             raise ReagentVersionUnknown("Could not identify flowcell mode for NovaSeqXPlus")
diff --git a/tests/test_run_type_recognizer.py b/tests/test_run_type_recognizer.py
index c72d4e3..7e7c408 100644
--- a/tests/test_run_type_recognizer.py
+++ b/tests/test_run_type_recognizer.py
@@ -168,6 +168,25 @@ def test_novaseq_reagent_version_raises(self):
             self.novaseq.reagent_version(mock_runtype_recognizer)
 
     def test_novaseqxplus_reagent_version(self):
+        runtype_dict = {
+            "RunParameters": {
+                "ConsumableInfo": {
+                    "ConsumableInfo": [
+                        {"Type": "FlowCell", "Name": "10B"},
+                        {"Type": "Reagent"},
+                        {"Type": "Buffer"},
+                    ]
+                }
+            }
+        }
+        mock_runtype_recognizer = self.MockRunTypeRecognizer(run_parameters=runtype_dict)
+
+        actual = self.novaseqxplus.reagent_version(mock_runtype_recognizer)
+        expected = "10B"
+
+        self.assertEqual(actual, expected)
+
+    def test_novaseqxplus_reagent_version_old(self):
         runtype_dict = {
             "RunParameters": {
                 "ConsumableInfo": {

From 11fc43d09328d17c8ac1319777fa3fa6fab8c6f1 Mon Sep 17 00:00:00 2001
From: Adrien Coulier <adrien.coulier@medsci.uu.se>
Date: Mon, 4 Dec 2023 16:33:42 +0100
Subject: [PATCH 2/2] Bump version to 4.0.0-rc2

---
 checkQC/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checkQC/__init__.py b/checkQC/__init__.py
index ba15a80..350a786 100644
--- a/checkQC/__init__.py
+++ b/checkQC/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = "4.0.0-rc1"
+__version__ = "4.0.0-rc2"