replaced changing values

Opentrons · Jun 28, 2024 · d09e7be · d09e7be
1 parent a763393
commit d09e7be
Show file tree

Hide file tree

Showing 45 changed files with 121 additions and 80 deletions.
diff --git a/analyses-snapshot-testing/README.md b/analyses-snapshot-testing/README.md
@@ -10,7 +10,7 @@
 
 ## Concepts
 
-- If working locally the branch you have checked out is the test code and snapshots you are working with.
+- If working locally the branch you have checked out is the test code/snapshots you are working with.
   - In CI this is the `SNAPSHOT_REF`. This is the branch or tag of the test code/snapshots that analyses generated will be compared to.
 - The `ANALYSIS_REF` is the branch or tag that you want analyses generated from.
 
@@ -33,7 +33,7 @@
 
 ## Running the tests against specific protocols
 
-> Note that we are omitting ANALYSIS_REF=edge because we can, it is the default in the Makefile
+> We are omitting ANALYSIS_REF=edge because we can, it is the default in the Makefile
 
 - `make snapshot-test PROTOCOL_NAMES=Flex_S_v2_19_Illumina_DNA_PCR_Free OVERRIDE_PROTOCOL_NAMES=none`
 - `make snapshot-test PROTOCOL_NAMES=none OVERRIDE_PROTOCOL_NAMES=Flex_X_v2_18_NO_PIPETTES_Overrides_BadTypesInRTP`

diff --git a/analyses-snapshot-testing/automation/data/protocol_registry.py b/analyses-snapshot-testing/automation/data/protocol_registry.py
@@ -46,5 +46,9 @@ def _what_protocols(self) -> Optional[list[Protocol]]:
     def all_defined_protocols(self) -> list[Protocol]:
         return [getattr(self.protocols, prop) for prop in dir(self.protocols) if "__" not in prop]
 
-    def all_defined_protocols_with_overrides(self) -> list[ProtocolWithOverrides]:
-        return [getattr(self.protocols_with_overrides, prop) for prop in dir(self.protocols_with_overrides) if "__" not in prop]
+    def all_defined_protocols_with_overrides(self) -> list[Protocol]:
+        protocols_with_overrides = [
+            getattr(self.protocols_with_overrides, prop) for prop in dir(self.protocols_with_overrides) if "__" not in prop
+        ]
+        # Flatten the list of lists into a single list of protocols
+        return [protocol for protocol_with_overrides in protocols_with_overrides for protocol in protocol_with_overrides.protocols]
diff --git a/...73][Flex_X_v2_18_NO_PIPETTES_Overrides_BadTypesInRTP_Override_wrong_type_in_maximum].json b/...73][Flex_X_v2_18_NO_PIPETTES_Overrides_BadTypesInRTP_Override_wrong_type_in_maximum].json
@@ -21,7 +21,7 @@
           "errorInfo": {
             "args": "(\"Maximum is type 'str', but must be of parameter type 'int'\",)",
             "class": "ParameterDefinitionError",
-            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 80, in _parse_and_set_parameters\n    exec(\"add_parameters(__param_context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"Flex_X_v2_18_NO_PIPETTES_Overrides_BadTypesInRTP_Override_wrong_type_in_maximum.py\", line 104, in add_parameters\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/_parameter_context.py\", line 62, in add_int\n    parameter = parameter_definition.create_int_parameter(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/parameter_definition.py\", line 202, in create_int_parameter\n    return ParameterDefinition(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/parameter_definition.py\", line 97, in __init__\n    validation.validate_options(default, minimum, maximum, choices, parameter_type)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/validation.py\", line 267, in validate_options\n    _validate_min_and_max(minimum, maximum, parameter_type)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/validation.py\", line 219, in _validate_min_and_max\n    raise ParameterDefinitionError(\n"
+            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line N, in _parse_and_set_parameters\n    exec(\"add_parameters(__param_context)\", new_globs)\n\n  File \"<string>\", line N, in <module>\n\n  File \"Flex_X_v2_18_NO_PIPETTES_Overrides_BadTypesInRTP_Override_wrong_type_in_maximum.py\", line N, in add_parameters\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/_parameter_context.py\", line N, in add_int\n    parameter = parameter_definition.create_int_parameter(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/parameter_definition.py\", line N, in create_int_parameter\n    return ParameterDefinition(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/parameter_definition.py\", line N, in __init__\n    validation.validate_options(default, minimum, maximum, choices, parameter_type)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/validation.py\", line N, in validate_options\n    _validate_min_and_max(minimum, maximum, parameter_type)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/parameters/validation.py\", line N, in _validate_min_and_max\n    raise ParameterDefinitionError(\n"
           },
           "errorType": "PythonException",
           "isDefined": false,

diff --git a/...test/test_analysis_snapshot[0cbde10c37][OT2_S_v2_18_P300M_P20S_HS_TC_TM_SmokeTestV3].json b/...test/test_analysis_snapshot[0cbde10c37][OT2_S_v2_18_P300M_P20S_HS_TC_TM_SmokeTestV3].json
@@ -9206,7 +9206,7 @@
           "filename": "None",
           "filename2": "None",
           "strerror": "None",
-          "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/command_executor.py\", line 146, in execute\n    result = await command_impl.execute(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/commands/load_labware.py\", line 133, in execute\n    loaded_labware = await self._equipment.load_labware(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line 168, in load_labware\n    definition = await self._labware_data_provider.get_labware_definition(\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line 877, in run_sync_in_worker_thread\n    return await future\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line 807, in run\n    result = context.run(func, *args)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/resources/labware_data_provider.py\", line 48, in _get_labware_definition_sync\n    get_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line 63, in get_labware_definition\n    return _get_standard_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line 243, in _get_standard_labware_definition\n    raise FileNotFoundError(\n"
+          "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/command_executor.py\", line N, in execute\n    result = await command_impl.execute(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/commands/load_labware.py\", line N, in execute\n    loaded_labware = await self._equipment.load_labware(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line N, in load_labware\n    definition = await self._labware_data_provider.get_labware_definition(\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line N, in run_sync_in_worker_thread\n    return await future\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line N, in run\n    result = context.run(func, *args)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/resources/labware_data_provider.py\", line N, in _get_labware_definition_sync\n    get_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line N, in get_labware_definition\n    return _get_standard_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line N, in _get_standard_labware_definition\n    raise FileNotFoundError(\n"
         },
         "errorType": "PythonException",
         "isDefined": false,
@@ -9220,7 +9220,7 @@
               "code": "ErrorCodes.GENERAL_ERROR",
               "detail": "{}",
               "message": "Labware definition for matching opentrons/cpx_4_tuberack_100ul/1 not found.",
-              "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line 166, in load_labware\n    definition = self._state_store.labware.get_definition_by_uri(definition_uri)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 346, in get_definition_by_uri\n    raise errors.LabwareDefinitionDoesNotExistError(\n",
+              "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line N, in load_labware\n    definition = self._state_store.labware.get_definition_by_uri(definition_uri)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    raise errors.LabwareDefinitionDoesNotExistError(\n",
               "wrapping": "[]"
             },
             "errorType": "PythonException",
@@ -9232,7 +9232,7 @@
                 "errorInfo": {
                   "args": "('opentrons/cpx_4_tuberack_100ul/1',)",
                   "class": "KeyError",
-                  "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 344, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
+                  "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
                 },
                 "errorType": "PythonException",
                 "isDefined": false,
@@ -9244,7 +9244,7 @@
                 "errorInfo": {
                   "args": "('opentrons/cpx_4_tuberack_100ul/1',)",
                   "class": "KeyError",
-                  "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 344, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
+                  "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
                 },
                 "errorType": "PythonException",
                 "isDefined": false,
@@ -9299,7 +9299,7 @@
                 "filename": "None",
                 "filename2": "None",
                 "strerror": "None",
-                "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/command_executor.py\", line 146, in execute\n    result = await command_impl.execute(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/commands/load_labware.py\", line 133, in execute\n    loaded_labware = await self._equipment.load_labware(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line 168, in load_labware\n    definition = await self._labware_data_provider.get_labware_definition(\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line 877, in run_sync_in_worker_thread\n    return await future\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line 807, in run\n    result = context.run(func, *args)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/resources/labware_data_provider.py\", line 48, in _get_labware_definition_sync\n    get_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line 63, in get_labware_definition\n    return _get_standard_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line 243, in _get_standard_labware_definition\n    raise FileNotFoundError(\n"
+                "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/command_executor.py\", line N, in execute\n    result = await command_impl.execute(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/commands/load_labware.py\", line N, in execute\n    loaded_labware = await self._equipment.load_labware(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line N, in load_labware\n    definition = await self._labware_data_provider.get_labware_definition(\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line N, in run_sync_in_worker_thread\n    return await future\n\n  File \"/usr/local/lib/python3.10/site-packages/anyio/_backends/_asyncio.py\", line N, in run\n    result = context.run(func, *args)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/resources/labware_data_provider.py\", line N, in _get_labware_definition_sync\n    get_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line N, in get_labware_definition\n    return _get_standard_labware_definition(load_name, namespace, version)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/labware.py\", line N, in _get_standard_labware_definition\n    raise FileNotFoundError(\n"
               },
               "errorType": "PythonException",
               "isDefined": false,
@@ -9313,7 +9313,7 @@
                     "code": "ErrorCodes.GENERAL_ERROR",
                     "detail": "{}",
                     "message": "Labware definition for matching opentrons/cpx_4_tuberack_100ul/1 not found.",
-                    "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line 166, in load_labware\n    definition = self._state_store.labware.get_definition_by_uri(definition_uri)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 346, in get_definition_by_uri\n    raise errors.LabwareDefinitionDoesNotExistError(\n",
+                    "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/execution/equipment.py\", line N, in load_labware\n    definition = self._state_store.labware.get_definition_by_uri(definition_uri)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    raise errors.LabwareDefinitionDoesNotExistError(\n",
                     "wrapping": "[]"
                   },
                   "errorType": "PythonException",
@@ -9325,7 +9325,7 @@
                       "errorInfo": {
                         "args": "('opentrons/cpx_4_tuberack_100ul/1',)",
                         "class": "KeyError",
-                        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 344, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
+                        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
                       },
                       "errorType": "PythonException",
                       "isDefined": false,
@@ -9337,7 +9337,7 @@
                       "errorInfo": {
                         "args": "('opentrons/cpx_4_tuberack_100ul/1',)",
                         "class": "KeyError",
-                        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line 344, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
+                        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/labware.py\", line N, in get_definition_by_uri\n    return self._state.definitions_by_uri[uri]\n"
                       },
                       "errorType": "PythonException",
                       "isDefined": false,