rename to allCommandErrors

Opentrons · Jul 31, 2024 · 09321af · 09321af
1 parent a870280
commit 09321af
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 50 deletions.
diff --git a/api-client/src/runs/types.ts b/api-client/src/runs/types.ts
@@ -47,6 +47,7 @@ export interface LegacyGoodRunData {
   status: RunStatus
   actions: RunAction[]
   errors: RunError[]
+  allCommandErrors: RunError[]
   pipettes: LoadedPipette[]
   labware: LoadedLabware[]
   liquids: Liquid[]

diff --git a/api/src/opentrons/cli/analyze.py b/api/src/opentrons/cli/analyze.py
@@ -275,7 +275,7 @@ async def _do_analyze(protocol_source: ProtocolSource) -> RunResult:
                 modules=[],
                 labwareOffsets=[],
                 liquids=[],
-                fullErrorList=[error_occ],
+                allCommandErrors=[error_occ],
             ),
             parameters=[],
         )

diff --git a/api/src/opentrons/protocol_engine/state/state.py b/api/src/opentrons/protocol_engine/state/state.py
@@ -129,7 +129,7 @@ def get_summary(self) -> StateSummary:
             completedAt=self._state.commands.run_completed_at,
             startedAt=self._state.commands.run_started_at,
             liquids=self._liquid.get_all(),
-            fullErrorList=self._commands.get_all_errors(),
+            allCommandErrors=self._commands.get_all_errors(),
         )
 
 

diff --git a/api/src/opentrons/protocol_engine/state/state_summary.py b/api/src/opentrons/protocol_engine/state/state_summary.py
@@ -21,7 +21,7 @@ class StateSummary(BaseModel):
     # errors is a list for historical reasons. (This model needs to stay compatible with
     # robot-server's database.) It shouldn't have more than 1 element.
     errors: List[ErrorOccurrence]
-    fullErrorList: List[ErrorOccurrence]
+    allCommandErrors: List[ErrorOccurrence]
     labware: List[LoadedLabware]
     pipettes: List[LoadedPipette]
     modules: List[LoadedModule]

diff --git a/robot-server/robot_server/maintenance_runs/maintenance_run_data_manager.py b/robot-server/robot_server/maintenance_runs/maintenance_run_data_manager.py
@@ -32,7 +32,7 @@ def _build_run(
         pipettes=[],
         modules=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
     return MaintenanceRun.construct(
         id=run_id,
@@ -48,7 +48,7 @@ def _build_run(
         completedAt=state_summary.completedAt,
         startedAt=state_summary.startedAt,
         liquids=state_summary.liquids,
-        fullErrorList=state_summary.fullErrorList,
+        allCommandErrors=state_summary.allCommandErrors,
     )
 
 

diff --git a/robot-server/robot_server/maintenance_runs/maintenance_run_models.py b/robot-server/robot_server/maintenance_runs/maintenance_run_models.py
@@ -47,7 +47,7 @@ class MaintenanceRun(ResourceModel):
             " but it won't have more than one element."
         ),
     )
-    fullErrorList: List[ErrorOccurrence] = Field(
+    allCommandErrors: List[ErrorOccurrence] = Field(
         ...,
         description=("A list of errors that occured during the run."),
     )

diff --git a/robot-server/robot_server/runs/run_data_manager.py b/robot-server/robot_server/runs/run_data_manager.py
@@ -44,7 +44,7 @@ def _build_run(
             actions=run_resource.actions,
             status=state_summary.status,
             errors=state_summary.errors,
-            fullErrorList=state_summary.fullErrorList,
+            allCommandErrors=state_summary.allCommandErrors,
             labware=state_summary.labware,
             labwareOffsets=state_summary.labwareOffsets,
             pipettes=state_summary.pipettes,
@@ -66,7 +66,7 @@ def _build_run(
             pipettes=[],
             modules=[],
             liquids=[],
-            fullErrorList=[],
+            allCommandErrors=[],
         )
         errors.append(state_summary.dataError)
     else:
@@ -109,7 +109,7 @@ def _build_run(
         startedAt=state.startedAt,
         liquids=state.liquids,
         runTimeParameters=run_time_parameters,
-        fullErrorList=state.fullErrorList,
+        allCommandErrors=state.allCommandErrors,
     )
 
 

diff --git a/robot-server/robot_server/runs/run_models.py b/robot-server/robot_server/runs/run_models.py
@@ -110,7 +110,7 @@ class Run(ResourceModel):
             " but it won't have more than one element."
         ),
     )
-    fullErrorList: List[ErrorOccurrence] = Field(
+    allCommandErrors: List[ErrorOccurrence] = Field(
         ...,
         description=("A list of errors that occured during the run."),
     )
@@ -187,7 +187,7 @@ class BadRun(ResourceModel):
             " but it won't have more than one element."
         ),
     )
-    fullErrorList: List[ErrorOccurrence] = Field(
+    allCommandErrors: List[ErrorOccurrence] = Field(
         ...,
         description=("A list of errors that occured during the run."),
     )

diff --git a/robot-server/tests/integration/http_api/runs/test_json_v6_protocol_run.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_json_v6_protocol_run.tavern.yaml
@@ -37,7 +37,7 @@ stages:
           current: True
           actions: []
           errors: []
-          fullErrorList: []
+          allCommandErrors: []
           pipettes: []
           modules: []
           labware:

diff --git a/robot-server/tests/integration/http_api/runs/test_json_v7_protocol_run.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_json_v7_protocol_run.tavern.yaml
@@ -37,7 +37,7 @@ stages:
           current: True
           actions: []
           errors: []
-          fullErrorList: []
+          allCommandErrors: []
           pipettes: []
           modules: []
           labware:

diff --git a/robot-server/tests/integration/http_api/runs/test_protocol_run.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_protocol_run.tavern.yaml
@@ -34,7 +34,7 @@ stages:
           current: True
           actions: []
           errors: []
-          fullErrorList: []
+          allCommandErrors: []
           pipettes: []
           modules: []
           labware:
@@ -242,6 +242,7 @@ stages:
           runTimeParameters: []
           completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
           errors: []
+          allCommandErrors: []
           pipettes: []
           modules: []
           protocolId: '{protocol_id}'

diff --git a/robot-server/tests/integration/http_api/runs/test_run_queued_protocol_commands.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_run_queued_protocol_commands.tavern.yaml
@@ -90,7 +90,7 @@ stages:
           createdAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
           current: True
           errors: []
-          fullErrorList: []
+          allCommandErrors: []
           id: '{run_id}'
           labware: []
           labwareOffsets: []

diff --git a/robot-server/tests/integration/http_api/runs/test_run_with_run_time_parameters.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_run_with_run_time_parameters.tavern.yaml
@@ -43,7 +43,7 @@ stages:
           current: True
           actions: []
           errors: []
-          fullErrorList: []
+          allCommandErrors: []
           pipettes: []
           modules: []
           labware: []

diff --git a/robot-server/tests/maintenance_runs/router/test_base_router.py b/robot-server/tests/maintenance_runs/router/test_base_router.py
@@ -75,7 +75,7 @@ async def test_create_run(
         labwareOffsets=[],
         status=pe_types.EngineStatus.IDLE,
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(
@@ -147,7 +147,7 @@ async def test_get_run_data_from_url(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(mock_maintenance_run_data_manager.get("run-id")).then_return(
@@ -197,7 +197,7 @@ async def test_get_run() -> None:
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     result = await get_run(run_data=run_data)
@@ -223,7 +223,7 @@ async def test_get_current_run(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
     decoy.when(mock_maintenance_run_data_manager.current_run_id).then_return(
         "current-run-id"

diff --git a/robot-server/tests/maintenance_runs/router/test_labware_router.py b/robot-server/tests/maintenance_runs/router/test_labware_router.py
@@ -38,7 +38,7 @@ def run() -> MaintenanceRun:
         modules=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
 

diff --git a/robot-server/tests/maintenance_runs/test_run_data_manager.py b/robot-server/tests/maintenance_runs/test_run_data_manager.py
@@ -63,7 +63,7 @@ def engine_state_summary() -> StateSummary:
     return StateSummary(
         status=EngineStatus.IDLE,
         errors=[ErrorOccurrence.construct(id="some-error-id")],  # type: ignore[call-arg]
-        fullErrorList=[ErrorOccurrence.construct(id="some-error-id")],  # type: ignore[call-arg]
+        allCommandErrors=[ErrorOccurrence.construct(id="some-error-id")],  # type: ignore[call-arg]
         labware=[LoadedLabware.construct(id="some-labware-id")],  # type: ignore[call-arg]
         labwareOffsets=[LabwareOffset.construct(id="some-labware-offset-id")],  # type: ignore[call-arg]
         pipettes=[LoadedPipette.construct(id="some-pipette-id")],  # type: ignore[call-arg]
@@ -133,7 +133,7 @@ async def test_create(
         status=engine_state_summary.status,
         actions=[],
         errors=engine_state_summary.errors,
-        fullErrorList=engine_state_summary.fullErrorList,
+        allCommandErrors=engine_state_summary.allCommandErrors,
         labware=engine_state_summary.labware,
         labwareOffsets=engine_state_summary.labwareOffsets,
         pipettes=engine_state_summary.pipettes,
@@ -186,7 +186,7 @@ async def test_create_with_options(
         status=engine_state_summary.status,
         actions=[],
         errors=engine_state_summary.errors,
-        fullErrorList=engine_state_summary.fullErrorList,
+        allCommandErrors=engine_state_summary.allCommandErrors,
         labware=engine_state_summary.labware,
         labwareOffsets=engine_state_summary.labwareOffsets,
         pipettes=engine_state_summary.pipettes,
@@ -255,7 +255,7 @@ async def test_get_current_run(
         status=engine_state_summary.status,
         actions=[],
         errors=engine_state_summary.errors,
-        fullErrorList=engine_state_summary.fullErrorList,
+        allCommandErrors=engine_state_summary.allCommandErrors,
         labware=engine_state_summary.labware,
         labwareOffsets=engine_state_summary.labwareOffsets,
         pipettes=engine_state_summary.pipettes,

diff --git a/robot-server/tests/protocols/test_protocol_analyzer.py b/robot-server/tests/protocols/test_protocol_analyzer.py
@@ -189,7 +189,7 @@ async def test_analyze(
                 modules=[],
                 labwareOffsets=[],
                 liquids=[],
-                fullErrorList=[],
+                allCommandErrors=[],
             ),
             parameters=[bool_parameter],
         )

diff --git a/robot-server/tests/runs/router/test_base_router.py b/robot-server/tests/runs/router/test_base_router.py
@@ -84,7 +84,7 @@ async def test_create_run(
         labwareOffsets=[],
         status=pe_types.EngineStatus.IDLE,
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
     decoy.when(
         await mock_deck_configuration_store.get_deck_configuration()
@@ -160,7 +160,7 @@ async def test_create_protocol_run(
         labwareOffsets=[],
         status=pe_types.EngineStatus.IDLE,
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
     decoy.when(
         await mock_deck_configuration_store.get_deck_configuration()
@@ -282,7 +282,7 @@ async def test_get_run_data_from_url(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(mock_run_data_manager.get("run-id")).then_return(expected_response)
@@ -329,7 +329,7 @@ async def test_get_run() -> None:
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     result = await get_run(run_data=run_data)
@@ -375,7 +375,7 @@ async def test_get_runs_not_empty(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     response_2 = Run(
@@ -391,7 +391,7 @@ async def test_get_runs_not_empty(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(mock_run_data_manager.get_all(20)).then_return([response_1, response_2])
@@ -470,7 +470,7 @@ async def test_update_run_to_not_current(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(await mock_run_data_manager.update("run-id", current=False)).then_return(
@@ -505,7 +505,7 @@ async def test_update_current_none_noop(
         labware=[],
         labwareOffsets=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
     decoy.when(await mock_run_data_manager.update("run-id", current=None)).then_return(

diff --git a/robot-server/tests/runs/router/test_labware_router.py b/robot-server/tests/runs/router/test_labware_router.py
@@ -40,7 +40,7 @@ def run() -> Run:
         labwareOffsets=[],
         protocolId=None,
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )
 
 

diff --git a/robot-server/tests/runs/test_run_controller.py b/robot-server/tests/runs/test_run_controller.py
@@ -65,7 +65,7 @@ def engine_state_summary() -> StateSummary:
         pipettes=[],
         modules=[],
         liquids=[],
-        fullErrorList=[],
+        allCommandErrors=[],
     )