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

Author: jerader

protocol-designer/src/file-data/__tests__/createFile.test.ts

@@ -166,12 +166,14 @@ def run(protocol: protocol_api.ProtocolContext) -> None:
         location="1",
         label="Opentrons 96 Tip Rack 10 µL",
         namespace="opentrons",
+        version=1,
     )
     mock_python_name_3 = protocol.load_labware(
         "fixture_96_plate",
         location="7",
         label="NEST 96 Well Plate 100 µL PCR Full Skirt",
         namespace="opentrons",
+        version=1,
     )
 
     # Load Pipettes:

protocol-designer/src/load-file/migration/utils/getMigrationPositionFromTop.ts

@@ -8,13 +8,7 @@ export const getMigratedPositionFromTop = (
   labware: Labware,
   type: MoveLiquidPrefixType
 ): number => {
-  const labwareDefUri = labware[formLabwareId].labwareDefURI
-
-  if (labwareDefUri == null) {
-    console.error(
-      `unable to find matching labware def uri from form labware id ${formLabwareId}`
-    )
-  }
+  const labwareDefUri = labware[formLabwareId]?.labwareDefURI
 
   //    early exit for dispense_labware equaling trashBin or wasteChute
   if (labwareDefsByURI[labwareDefUri] == null) {

protocol-designer/src/pages/Designer/utils.ts

@@ -250,13 +250,23 @@ const getLabwareInfo = (
   nicknamesById: Record<string, string>,
   activeDeckSetup: AllTemporalPropertiesForTimelineFrame,
   labwareId: string,
-  robotType: RobotType
+  robotType: RobotType,
+  t: any
 ): { nickName: string; latestSlot: string } => {
-  const { modules, labware } = activeDeckSetup
-  const stack = labware[labwareId].stack
-  const latestSlot = resolveSlotLocation(modules, stack, robotType)
-
-  return { nickName: nicknamesById[labwareId], latestSlot }
+  const { modules } = activeDeckSetup
+  const stack = activeDeckSetup.labware[labwareId]?.stack
+  const latestSlot =
+    stack != null
+      ? resolveSlotLocation(modules, stack, robotType)
+      : 'unknown slot'
+  const name = nicknamesById[labwareId]
+  let nickName: string = name
+  if (latestSlot != null && latestSlot !== 'offDeck') {
+    nickName = t('labware_in_slot', { name, slot: latestSlot })
+  } else if (latestSlot != null && latestSlot === 'offDeck') {
+    nickName = t('labware_offdeck', { name })
+  }
+  return { nickName, latestSlot }
 }
 
 export const useLabwareDropdownOptions = (
@@ -277,7 +287,9 @@ export const useLabwareDropdownOptions = (
       labwareId: string
     ): DropdownOption[] => {
       const { def } = labwareEntity
-      const deckSlot = getSlotInLocationStack(deckSetupLabware[labwareId].stack)
+      const deckSlot = getSlotInLocationStack(
+        deckSetupLabware[labwareId]?.stack
+      )
       const fullStackFromLabwares = getFullStackFromLabwares(
         deckSetupLabware,
         deckSlot
@@ -306,7 +318,8 @@ export const useLabwareDropdownOptions = (
         nicknamesById,
         activeDeckSetup,
         labwareId,
-        robotType
+        robotType,
+        t
       )
       const isTiprack = getIsTiprack(def)
       const isFilterOffDeck =

step-generation/src/__tests__/pythonFileUtils.test.ts

@@ -19,6 +19,7 @@ import {
 } from '@opentrons/shared-data'
 
 import {
+  formatChangeTipArg,
   getDefineLiquids,
   getLoadAdapters,
   getLoadLabware,
@@ -226,6 +227,7 @@ describe('getLoadAdapters', () => {
 adapter_1 = magnetic_block_1.load_adapter(
     "fixture_flex_96_tiprack_adapter",
     namespace="opentrons",
+    version=1,
 )
 adapter_2 = protocol.load_adapter_from_definition(
     CUSTOM_LABWARE["fixture/fixture_flex_96_tiprack_adapter/1"],
@@ -252,10 +254,12 @@ well_plate_1 = adapter_2.load_labware(
     label="reagent plate",
     namespace="opentrons",
     lid="mock_lid",
+    version=1,
 )
 well_plate_2 = magnetic_block_2.load_labware(
     "fixture_96_plate",
     namespace="opentrons",
+    version=1,
 )
 well_plate_3 = protocol.load_labware_from_definition(
     CUSTOM_LABWARE["fixture/fixture_96_plate/1"],
@@ -288,6 +292,7 @@ well_plate_5 = protocol.load_labware(
     "fixture_96_plate",
     location=protocol_api.OFF_DECK,
     namespace="opentrons",
+    version=1,
 )`.trimStart()
       )
     })
@@ -580,3 +585,15 @@ glycerol_50_base_class = protocol.get_liquid_class("glycerol_50")`.trimStart()
     )
   })
 })
+
+describe('formatChangeTipArg', () => {
+  it('should transform perSource into per source', () => {
+    expect(formatChangeTipArg('perSource')).toBe('per source')
+  })
+  it('should transform perDest into per destination', () => {
+    expect(formatChangeTipArg('perDest')).toBe('per destination')
+  })
+  it('should not alter never', () => {
+    expect(formatChangeTipArg('never')).toBe('never')
+  })
+})

step-generation/src/commandCreators/compound/consolidate.ts

@@ -22,6 +22,7 @@ import {
   curryCommandCreator,
   curryWithoutPython,
   DEST_WELL_BLOWOUT_DESTINATION,
+  formatChangeTipArg,
   formatPyStr,
   getIsRetractSafeForAirGap,
   getIsSafePipetteMovement,
@@ -373,9 +374,7 @@ export const consolidate: CommandCreator<ConsolidateArgs> = (
     `dest=${
       pythonDestWells != null ? `[${pythonDestWells}]` : destTrashPipetteName
     }`,
-    //  TODO: fix bug where new_tip api arg does not allow
-    //  changeTip: always but PD does
-    `new_tip=${formatPyStr(changeTip)}`,
+    `new_tip=${formatPyStr(formatChangeTipArg(changeTip))}`,
     `trash_location=${trashPipetteName}`,
     ...(pipetteSpecs.channels > 1 ? [`group_wells=False`] : []),
     `keep_last_tip=True`,

step-generation/src/commandCreators/compound/distribute.ts

@@ -23,6 +23,7 @@ import {
   curryCommandCreator,
   curryWithoutPython,
   DEST_WELL_BLOWOUT_DESTINATION,
+  formatChangeTipArg,
   formatPyStr,
   getIsRetractSafeForAirGap,
   getIsSafePipetteMovement,
@@ -405,9 +406,7 @@ export const distribute: CommandCreator<DistributeArgs> = (
     `volume=${volume}`,
     `source=[${pythonSourceWells}]`,
     `dest=[${pythonDestWells ?? destTrashPipetteName}]`,
-    //  TODO: fix bug where new_tip api arg does not allow
-    //  changeTip: always but PD does
-    `new_tip=${formatPyStr(changeTip)}`,
+    `new_tip=${formatPyStr(formatChangeTipArg(changeTip))}`,
     `trash_location=${trashPipetteName}`,
     ...(pipetteSpecs.channels > 1 ? [`group_wells=False`] : []),
     `keep_last_tip=True`,

step-generation/src/commandCreators/compound/transfer.ts

@@ -19,6 +19,7 @@ import {
   curryCommandCreator,
   curryWithoutPython,
   DEST_WELL_BLOWOUT_DESTINATION,
+  formatChangeTipArg,
   formatPyStr,
   getIsRetractSafeForAirGap,
   getSlotInLocationStack,
@@ -376,7 +377,7 @@ export const transfer: CommandCreator<TransferArgs> = (
     `dest=${
       pythonDestWells != null ? `[${pythonDestWells}]` : destTrashPipetteName
     }`,
-    `new_tip=${formatPyStr(changeTip)}`,
+    `new_tip=${formatPyStr(formatChangeTipArg(changeTip))}`,
     `trash_location=${trashPipetteName}`,
     ...(pipetteSpecs.channels > 1 ? [`group_wells=False`] : []),
     `keep_last_tip=True`,

step-generation/src/utils/pythonFileUtils.ts

@@ -24,6 +24,7 @@ import {
 
 import type { CutoutId, ProtocolFile, RobotType } from '@opentrons/shared-data'
 import type {
+  ChangeTipOptions,
   InvariantContext,
   LabwareEntities,
   LabwareEntity,
@@ -114,7 +115,7 @@ export function getLoadAdapters(
   const pythonAdapters = Object.values(adapterEntities)
     .map(adapter => {
       const { id, def, pythonName } = adapter
-      const { parameters, namespace } = def
+      const { parameters, namespace, version } = def
       // 2nd item in stack is the slot the adapter is on
       const adapterSlot = labwareRobotState[id].stack[1]
       const onModule = moduleEntities[adapterSlot] != null
@@ -136,10 +137,7 @@ export function getLoadAdapters(
           `${formatPyStr(parameters.loadName)}`,
           ...(locationArg ? [locationArg] : []),
           `namespace=${formatPyStr(namespace)}`,
-          //  NOTE: temporarily removing version number
-          //  until PD migrated labware defs to the latest version
-          //  upon re-import
-          // `version=${version}`,
+          `version=${version}`,
         ].join(',\n')
         return (
           `${pythonName} = ${parentName}.load_adapter(\n` +
@@ -181,7 +179,7 @@ export function getLoadLabware(
   const pythonLabware = Object.values(labwareEntities)
     .map(labware => {
       const { id, def, pythonName } = labware
-      const { metadata, parameters, namespace } = def
+      const { metadata, parameters, namespace, version } = def
       const lidEntity = Object.values(lidEntities).find(
         lid => labwareRobotState[lid.id].stack[1] === id
       )
@@ -219,10 +217,7 @@ export function getLoadLabware(
           ...(lidEntity != null
             ? [`lid=${formatPyStr(lidEntity.def.parameters.loadName)}`]
             : []),
-          //  NOTE: temporarily removing version number
-          //  until PD migrated labware defs to the latest version
-          //  upon re-import
-          // `version=${version}`,
+          `version=${version}`,
         ].join(',\n')
         return (
           `${pythonName} = ${parentName}.load_labware(\n` +
@@ -528,3 +523,17 @@ export function pythonCustomLabwareDict(
     return ''
   }
 }
+
+export const formatChangeTipArg = (changeTip: ChangeTipOptions): string => {
+  switch (changeTip) {
+    case 'perDest': {
+      return 'per destination'
+    }
+    case 'perSource': {
+      return 'per source'
+    }
+    default: {
+      return changeTip
+    }
+  }
+}