Merge remote-tracking branch 'origin/chore_release-pd-8.5.0' into HEAD

jerader · jerader · commit 1865af9822a9 · 2025-07-30T10:16:38.000-04:00
diff --git a/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/quickTransferStepCommands.test.ts b/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/quickTransferStepCommands.test.ts
@@ -243,7 +243,6 @@ pipette.transfer_with_liquid_class(
                     "position_reference": "well-bottom",
                 },
                 "flow_rate_by_volume": [(0, 80)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -262,6 +261,7 @@ pipette.transfer_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "source", "flow_rate": 50},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
@@ -396,7 +396,6 @@ pipette.consolidate_with_liquid_class(
                     "position_reference": "well-bottom",
                 },
                 "flow_rate_by_volume": [(0, 80)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -415,6 +414,7 @@ pipette.consolidate_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "trash", "flow_rate": 50},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
@@ -550,7 +550,6 @@ pipette.distribute_with_liquid_class(
                     "position_reference": "well-bottom",
                 },
                 "flow_rate_by_volume": [(0, 80)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -569,6 +568,7 @@ pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "source", "flow_rate": 50},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
@@ -578,7 +578,6 @@ pipette.distribute_with_liquid_class(
                     "position_reference": "well-bottom",
                 },
                 "flow_rate_by_volume": [(0, 80)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -597,6 +596,7 @@ pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "source", "flow_rate": 50},
                 },
+                "correction_by_volume": [(0, 0)],
                 "conditioning_by_volume": [(0, 0)],
                 "disposal_by_volume": [(0, 0)],
             },
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json
@@ -2670,7 +2670,7 @@
       "displayColor": "#b925ff"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "c85ee673-fbc8-4831-8edf-29570cb23561",
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json
@@ -2694,7 +2694,7 @@
       "displayColor": "#b925ff"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "d08e269a-ebd5-4f00-8835-d4cf48f91bc2",
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json
@@ -4081,7 +4081,7 @@
       "displayColor": "#ffd600"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "6f95dddd-e02a-40dc-a239-e19fa19679ce",
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV8.json b/protocol-designer/fixtures/protocol/8/doItAllV8.json
@@ -3595,7 +3595,7 @@
       "displayColor": "#ffd600"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "05d36c47-4c9c-4e71-b79b-887983ec4d95",
diff --git a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json
@@ -3589,7 +3589,7 @@
       "displayColor": "#ffd600"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "5e5b7a38-df51-4e7a-8bee-a5a698b31ef2",
diff --git a/protocol-designer/fixtures/protocol/8/mix_8_0_0.json b/protocol-designer/fixtures/protocol/8/mix_8_0_0.json
@@ -2140,7 +2140,7 @@
   },
   "liquidSchemaId": "opentronsLiquidSchemaV1",
   "liquids": {},
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "d66aa1db-df76-492d-ab2c-533b982522aa",
diff --git a/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json b/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json
@@ -3649,7 +3649,7 @@
   },
   "liquidSchemaId": "opentronsLiquidSchemaV1",
   "liquids": {},
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "62957217-7b11-4df8-b810-214307ce9ceb",
diff --git a/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json b/protocol-designer/fixtures/protocol/8/ninetySixChannelFullAndColumn.json
@@ -2386,7 +2386,7 @@
   },
   "liquidSchemaId": "opentronsLiquidSchemaV1",
   "liquids": {},
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "3e17b235-5fa0-4d7e-8826-abe7b481fc81",
diff --git a/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json
@@ -2274,7 +2274,7 @@
       "displayColor": "#b925ff"
     }
   },
-  "commandSchemaId": "opentronsCommandSchemaV10",
+  "commandSchemaId": "opentronsCommandSchemaV14",
   "commands": [
     {
       "key": "ffe32279-1362-4a67-bb58-44c67d98458d",
diff --git a/protocol-designer/release-notes.md b/protocol-designer/release-notes.md
@@ -41,7 +41,7 @@ Use Opentrons-verified liquid classes to automatically define transfer settings
 - Successfully delete a defined liquid that has not been assigned to any location.
 - Display correct substep details for all transfer paths and pipettes.
 
-Running a protocol created in Protocol Designer now requires Opentrons App version 8.5.0 or newer.
+Running a protocol created in Protocol Designer now requires Opentrons App version 8.5.1 or newer.
 
 ## Opentrons Protocol Designer Changes in 8.4.4
 
diff --git a/protocol-designer/src/assets/localization/en/modal.json b/protocol-designer/src/assets/localization/en/modal.json
@@ -63,7 +63,7 @@
       "body12": "If the timer of a Heater-Shaker step is toggled on and off, the timer input field no longer errors.",
       "body13": "Successfully delete a defined liquid that has not been assigned to any location.",
       "body14": "Display correct substep details for all transfer paths and pipettes.",
-      "body15": "All protocols now require Opentrons App version 8.5.0+ to run.",
+      "body15": "All protocols now require Opentrons App version 8.5.1+ to run.",
       "body16": "For more information, see the <link1>Protocol Designer Instruction Manual</link1>.",
       "body2": "We're excited to introduce support for liquid classes and exporting Python!",
       "body3": "Additionally, improvements for the following:",
diff --git a/protocol-designer/src/file-data/selectors/fileCreator.ts b/protocol-designer/src/file-data/selectors/fileCreator.ts
@@ -39,7 +39,7 @@ import {
 
 import type {
   CommandAnnotationV1Mixin,
-  CommandV10Mixin,
+  CommandV14Mixin,
   CreateCommand,
   LabwareV2Mixin,
   LiquidV1Mixin,
@@ -253,8 +253,8 @@ export const createJSONFile: Selector<ProtocolFile> = createSelector(
       liquids,
     }
 
-    const commandv10Mixin: CommandV10Mixin = {
-      commandSchemaId: 'opentronsCommandSchemaV10',
+    const commandv14Mixin: CommandV14Mixin = {
+      commandSchemaId: 'opentronsCommandSchemaV14',
       commands,
     }
 
@@ -310,7 +310,7 @@ export const createJSONFile: Selector<ProtocolFile> = createSelector(
       ...deckStructure,
       ...labwareV2Mixin,
       ...liquidV2Mixin,
-      ...commandv10Mixin,
+      ...commandv14Mixin,
       ...commandAnnotionaV1Mixin,
     }
   }
diff --git a/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx b/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx
@@ -19,7 +19,7 @@ import {
   LINK_BUTTON_STYLE,
 } from '../../components/atoms'
 
-const REQUIRED_APP_VERSION = '8.5.0'
+const REQUIRED_APP_VERSION = '8.5.1'
 
 type MetadataInfo = Array<{
   author?: string
diff --git a/protocol-designer/src/pages/ProtocolOverview/__tests__/ProtocolMetadata.test.tsx b/protocol-designer/src/pages/ProtocolOverview/__tests__/ProtocolMetadata.test.tsx
@@ -45,7 +45,7 @@ describe('ProtocolMetadata', () => {
     screen.getByText('Protocol Metadata')
     screen.getByText('Edit')
     screen.getByText('Required app version')
-    screen.getByText('8.5.0 or higher')
+    screen.getByText('8.5.1 or higher')
   })
 
   it('should render protocol metadata', () => {
diff --git a/step-generation/src/__tests__/consolidate.test.ts b/step-generation/src/__tests__/consolidate.test.ts
@@ -153,7 +153,6 @@ mock_pipette.consolidate_with_liquid_class(
             "dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -166,6 +165,7 @@ mock_pipette.consolidate_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": False},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
@@ -246,7 +246,6 @@ mock_pipette.consolidate_with_liquid_class(
             "dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": True, "duration": 12},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -259,6 +258,7 @@ mock_pipette.consolidate_with_liquid_class(
                     "touch_tip": {"enabled": True, "z_offset": -3.4},
                     "blowout": {"enabled": True, "location": "destination", "flow_rate": 2.3},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": True, "repetitions": 1, "volume": 36},
             },
@@ -313,7 +313,6 @@ mock_pipette.consolidate_with_liquid_class(
             "dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -326,6 +325,7 @@ mock_pipette.consolidate_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": False},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
diff --git a/step-generation/src/__tests__/distribute.test.ts b/step-generation/src/__tests__/distribute.test.ts
@@ -189,7 +189,6 @@ mock_pipette.distribute_with_liquid_class(
             "dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0, "z": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -202,13 +201,13 @@ mock_pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "trash", "flow_rate": 2.3},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
             "multi_dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0, "z": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": False},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -221,6 +220,7 @@ mock_pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": False},
                     "blowout": {"enabled": True, "location": "trash", "flow_rate": 2.3},
                 },
+                "correction_by_volume": [(0, 0)],
                 "conditioning_by_volume": [(0, 0)],
                 "disposal_by_volume": [(0, 60)],
             },
@@ -1058,7 +1058,6 @@ mock_pipette.distribute_with_liquid_class(
             "dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0, "z": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": True, "duration": 12},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -1071,13 +1070,13 @@ mock_pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": True, "z_offset": -3.4},
                     "blowout": {"enabled": True, "location": "trash", "flow_rate": 2.3},
                 },
+                "correction_by_volume": [(0, 0)],
                 "push_out_by_volume": [(0, 0)],
                 "mix": {"enabled": False},
             },
             "multi_dispense": {
                 "dispense_position": {"offset": {"x": 0, "y": 0, "z": 0}},
                 "flow_rate_by_volume": [(0, 2.2)],
-                "correction_by_volume": [(0, 0)],
                 "delay": {"enabled": True, "duration": 12},
                 "submerge": {
                     "delay": {"enabled": False},
@@ -1090,6 +1089,7 @@ mock_pipette.distribute_with_liquid_class(
                     "touch_tip": {"enabled": True, "z_offset": -3.4},
                     "blowout": {"enabled": True, "location": "trash", "flow_rate": 2.3},
                 },
+                "correction_by_volume": [(0, 0)],
                 "conditioning_by_volume": [(0, 10)],
                 "disposal_by_volume": [(0, 60)],
             },
diff --git a/step-generation/src/__tests__/liquidClassUtils.test.tsx b/step-generation/src/__tests__/liquidClassUtils.test.tsx
diff --git a/step-generation/src/__tests__/transfer.test.ts b/step-generation/src/__tests__/transfer.test.ts
diff --git a/step-generation/src/commandCreators/compound/consolidate.ts b/step-generation/src/commandCreators/compound/consolidate.ts
diff --git a/step-generation/src/commandCreators/compound/distribute.ts b/step-generation/src/commandCreators/compound/distribute.ts
diff --git a/step-generation/src/commandCreators/compound/transfer.ts b/step-generation/src/commandCreators/compound/transfer.ts
diff --git a/step-generation/src/utils/liquidClassUtils.ts b/step-generation/src/utils/liquidClassUtils.ts

Original file line number	Diff line number	Diff line change
`@@ -2670,7 +2670,7 @@`
`2670`	`2670`	`"displayColor": "#b925ff"`
`2671`	`2671`	`}`
`2672`	`2672`	`},`
`2673`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`2673`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`2674`	`2674`	`"commands": [`
`2675`	`2675`	`{`
`2676`	`2676`	`"key": "c85ee673-fbc8-4831-8edf-29570cb23561",`
Original file line number	Diff line number	Diff line change
`@@ -2694,7 +2694,7 @@`
`2694`	`2694`	`"displayColor": "#b925ff"`
`2695`	`2695`	`}`
`2696`	`2696`	`},`
`2697`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`2697`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`2698`	`2698`	`"commands": [`
`2699`	`2699`	`{`
`2700`	`2700`	`"key": "d08e269a-ebd5-4f00-8835-d4cf48f91bc2",`
Original file line number	Diff line number	Diff line change
`@@ -4081,7 +4081,7 @@`
`4081`	`4081`	`"displayColor": "#ffd600"`
`4082`	`4082`	`}`
`4083`	`4083`	`},`
`4084`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`4084`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`4085`	`4085`	`"commands": [`
`4086`	`4086`	`{`
`4087`	`4087`	`"key": "6f95dddd-e02a-40dc-a239-e19fa19679ce",`
Original file line number	Diff line number	Diff line change
`@@ -3595,7 +3595,7 @@`
`3595`	`3595`	`"displayColor": "#ffd600"`
`3596`	`3596`	`}`
`3597`	`3597`	`},`
`3598`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`3598`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`3599`	`3599`	`"commands": [`
`3600`	`3600`	`{`
`3601`	`3601`	`"key": "05d36c47-4c9c-4e71-b79b-887983ec4d95",`
Original file line number	Diff line number	Diff line change
`@@ -3589,7 +3589,7 @@`
`3589`	`3589`	`"displayColor": "#ffd600"`
`3590`	`3590`	`}`
`3591`	`3591`	`},`
`3592`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`3592`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`3593`	`3593`	`"commands": [`
`3594`	`3594`	`{`
`3595`	`3595`	`"key": "5e5b7a38-df51-4e7a-8bee-a5a698b31ef2",`
Original file line number	Diff line number	Diff line change
`@@ -2140,7 +2140,7 @@`
`2140`	`2140`	`},`
`2141`	`2141`	`"liquidSchemaId": "opentronsLiquidSchemaV1",`
`2142`	`2142`	`"liquids": {},`
`2143`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`2143`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`2144`	`2144`	`"commands": [`
`2145`	`2145`	`{`
`2146`	`2146`	`"key": "d66aa1db-df76-492d-ab2c-533b982522aa",`
Original file line number	Diff line number	Diff line change
`@@ -3649,7 +3649,7 @@`
`3649`	`3649`	`},`
`3650`	`3650`	`"liquidSchemaId": "opentronsLiquidSchemaV1",`
`3651`	`3651`	`"liquids": {},`
`3652`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`3652`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`3653`	`3653`	`"commands": [`
`3654`	`3654`	`{`
`3655`	`3655`	`"key": "62957217-7b11-4df8-b810-214307ce9ceb",`
Original file line number	Diff line number	Diff line change
`@@ -2386,7 +2386,7 @@`
`2386`	`2386`	`},`
`2387`	`2387`	`"liquidSchemaId": "opentronsLiquidSchemaV1",`
`2388`	`2388`	`"liquids": {},`
`2389`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`2389`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`2390`	`2390`	`"commands": [`
`2391`	`2391`	`{`
`2392`	`2392`	`"key": "3e17b235-5fa0-4d7e-8826-abe7b481fc81",`
Original file line number	Diff line number	Diff line change
`@@ -2274,7 +2274,7 @@`
`2274`	`2274`	`"displayColor": "#b925ff"`
`2275`	`2275`	`}`
`2276`	`2276`	`},`
`2277`		`- "commandSchemaId": "opentronsCommandSchemaV10",`
	`2277`	`+ "commandSchemaId": "opentronsCommandSchemaV14",`
`2278`	`2278`	`"commands": [`
`2279`	`2279`	`{`
`2280`	`2280`	`"key": "ffe32279-1362-4a67-bb58-44c67d98458d",`