add py command to test

Author: jerader

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

@@ -51,5 +51,10 @@ describe('delayInTrash', () => {
         },
       },
     ])
+    expect(res.python).toBe(
+      `
+mockPythonName.move_to(mock_trash_bin_1)
+protocol.delay(seconds=30)`.trimStart()
+    )
   })
 })

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

@@ -29,6 +29,7 @@ describe('delayInWasteChute', () => {
     const args = {
       pipetteId: 'p10SingleId',
       seconds: 30,
+      destinationId: wasteChuteId,
     }
 
     const result = delayInWasteChute(args, invariantContext, prevRobotState)
@@ -51,5 +52,10 @@ describe('delayInWasteChute', () => {
         },
       },
     ])
+    expect(res.python).toBe(
+      `
+mockPythonName.move_to(mock_waste_chute_1)
+protocol.delay(seconds=30)`.trimStart()
+    )
   })
 })

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

@@ -53,5 +53,10 @@ describe('delayInWell', () => {
         },
       },
     ])
+    expect(res.python).toBe(
+      `
+mockPythonName.move_to(mockPythonName["B1"].bottom(z=10))
+protocol.delay(seconds=30)`.trimStart()
+    )
   })
 })

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

@@ -1,12 +1,7 @@
-import {
-  curryCommandCreator,
-  getTrashBinAddressableAreaName,
-  reduceCommandCreators,
-} from '../../utils'
+import { curryCommandCreator, reduceCommandCreators } from '../../utils'
 import { ZERO_OFFSET } from '../../constants'
 import { delay, moveToAddressableArea } from '../atomic'
 import type { CommandCreator, CurriedCommandCreator } from '../../types'
-import type { CutoutId } from '@opentrons/shared-data'
 
 interface DelayInTrashArgs {
   destinationId: string
@@ -20,15 +15,11 @@ export const delayInTrash: CommandCreator<DelayInTrashArgs> = (
   prevRobotState
 ) => {
   const { seconds, pipetteId, destinationId } = args
-  const addressableAreaName = getTrashBinAddressableAreaName(
-    invariantContext.additionalEquipmentEntities[destinationId]
-      .location as CutoutId
-  )
 
   const commandCreators: CurriedCommandCreator[] = [
     curryCommandCreator(moveToAddressableArea, {
       pipetteId,
-      addressableAreaName,
+      fixtureId: destinationId,
       offset: ZERO_OFFSET,
     }),
     curryCommandCreator(delay, {

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

@@ -1,13 +1,10 @@
-import {
-  curryCommandCreator,
-  getWasteChuteAddressableAreaNamePip,
-  reduceCommandCreators,
-} from '../../utils'
+import { curryCommandCreator, reduceCommandCreators } from '../../utils'
 import { ZERO_OFFSET } from '../../constants'
 import { delay, moveToAddressableArea } from '../atomic'
 import type { CommandCreator, CurriedCommandCreator } from '../../types'
 
 interface delayInWasteChuteArgs {
+  destinationId: string
   pipetteId: string
   seconds: number
 }
@@ -17,14 +14,12 @@ export const delayInWasteChute: CommandCreator<delayInWasteChuteArgs> = (
   invariantContext,
   prevRobotState
 ) => {
-  const { seconds, pipetteId } = args
-  const pipetteChannels =
-    invariantContext.pipetteEntities[pipetteId].spec.channels
+  const { seconds, pipetteId, destinationId } = args
 
   const commandCreators: CurriedCommandCreator[] = [
     curryCommandCreator(moveToAddressableArea, {
       pipetteId,
-      addressableAreaName: getWasteChuteAddressableAreaNamePip(pipetteChannels),
+      fixtureId: destinationId,
       offset: ZERO_OFFSET,
     }),
     curryCommandCreator(delay, {

step-generation/src/utils/misc.ts

@@ -753,6 +753,7 @@ export const moveAndDelayLocationHelper: CommandCreator<MoveAndDelayLocationHelp
   } else if (trashOrLabware === 'wasteChute') {
     commands = [
       curryCommandCreator(delayInWasteChute, {
+        destinationId,
         seconds,
         pipetteId,
       }),