@opentrons/shared-data 0.1.5 → 0.1.6-alpha.4

package/Makefile

@@ -6,7 +6,7 @@ SHELL := bash
 # These variables can be overriden when make is invoked to customize the
 # behavior of jest
 tests ?=
-cov_opts ?= --coverage=true --ci=true --collectCoverageFrom='shared-data/js/**/*.(js|ts|tsx)'
+cov_opts ?= --coverage=true
 test_opts ?=
 
 # Top level targets
@@ -28,7 +28,7 @@ clean: clean-py
 .PHONY: lib-js
 lib-js: export NODE_ENV := production
 lib-js:
-	NODE_OPTIONS=--openssl-legacy-provider yarn webpack
+	NODE_OPTIONS=--openssl-legacy-provider yarn vite build
 
 
 

package/command/index.ts

@@ -0,0 +1,5 @@
+import commandSchemaV7 from './schemas/7.json'
+import commandSchemaV8 from './schemas/8.json'
+export * from './types/index'
+
+export { commandSchemaV7, commandSchemaV8 }

package/command/schemas/8.json

@@ -19,6 +19,7 @@
       "home": "#/definitions/HomeCreate",
       "retractAxis": "#/definitions/RetractAxisCreate",
       "loadLabware": "#/definitions/LoadLabwareCreate",
+      "reloadLabware": "#/definitions/ReloadLabwareCreate",
       "loadLiquid": "#/definitions/LoadLiquidCreate",
       "loadModule": "#/definitions/LoadModuleCreate",
       "loadPipette": "#/definitions/LoadPipetteCreate",
@@ -112,6 +113,9 @@
     {
       "$ref": "#/definitions/LoadLabwareCreate"
     },
+    {
+      "$ref": "#/definitions/ReloadLabwareCreate"
+    },
     {
       "$ref": "#/definitions/LoadLiquidCreate"
     },
@@ -339,7 +343,7 @@
     "CommandIntent": {
       "title": "CommandIntent",
       "description": "Run intent for a given command.\n\nProps:\n    PROTOCOL: the command is part of the protocol run itself.\n    SETUP: the command is part of the setup phase of a run.",
-      "enum": ["protocol", "setup"],
+      "enum": ["protocol", "setup", "fixit"],
       "type": "string"
     },
     "AspirateCreate": {
@@ -612,7 +616,7 @@
         "frontRightNozzle": {
           "title": "Frontrightnozzle",
           "description": "The front right nozzle in your configuration.",
-          "pattern": "[A-Z][0-100]",
+          "pattern": "[A-Z]\\d{1,2}",
           "type": "string"
         }
       },
@@ -1407,6 +1411,49 @@
       },
       "required": ["params"]
     },
+    "ReloadLabwareParams": {
+      "title": "ReloadLabwareParams",
+      "description": "Payload required to load a labware into a slot.",
+      "type": "object",
+      "properties": {
+        "labwareId": {
+          "title": "Labwareid",
+          "description": "The already-loaded labware instance to update.",
+          "type": "string"
+        }
+      },
+      "required": ["labwareId"]
+    },
+    "ReloadLabwareCreate": {
+      "title": "ReloadLabwareCreate",
+      "description": "Reload labware command creation request.",
+      "type": "object",
+      "properties": {
+        "commandType": {
+          "title": "Commandtype",
+          "default": "reloadLabware",
+          "enum": ["reloadLabware"],
+          "type": "string"
+        },
+        "params": {
+          "$ref": "#/definitions/ReloadLabwareParams"
+        },
+        "intent": {
+          "description": "The reason the command was added. If not specified or `protocol`, the command will be treated as part of the protocol run itself, and added to the end of the existing command queue.\n\nIf `setup`, the command will be treated as part of run setup. A setup command may only be enqueued if the run has not started.\n\nUse setup commands for activities like pre-run calibration checks and module setup, like pre-heating.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/CommandIntent"
+            }
+          ]
+        },
+        "key": {
+          "title": "Key",
+          "description": "A key value, unique in this run, that can be used to track the same logical command across multiple runs of the same protocol. If a value is not provided, one will be generated.",
+          "type": "string"
+        }
+      },
+      "required": ["params"]
+    },
     "LoadLiquidParams": {
       "title": "LoadLiquidParams",
       "description": "Payload required to load a liquid into a well.",
@@ -2582,6 +2629,12 @@
       "enum": ["present", "absent", "unknown"],
       "type": "string"
     },
+    "InstrumentSensorId": {
+      "title": "InstrumentSensorId",
+      "description": "Primary and secondary sensor ids.",
+      "enum": ["primary", "secondary", "both"],
+      "type": "string"
+    },
     "VerifyTipPresenceParams": {
       "title": "VerifyTipPresenceParams",
       "description": "Payload required for a VerifyTipPresence command.",
@@ -2599,6 +2652,14 @@
               "$ref": "#/definitions/TipPresenceStatus"
             }
           ]
+        },
+        "followSingularSensor": {
+          "description": "The sensor id to follow if the other can be ignored.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/InstrumentSensorId"
+            }
+          ]
         }
       },
       "required": ["pipetteId", "expectedState"]

package/command/types/index.ts

@@ -31,7 +31,12 @@ export * from './timing'
 // NOTE: these key/value pairs will only be present on commands at analysis/run time
 // they pertain only to the actual execution status of a command on hardware, as opposed to
 // the command's identity and parameters which can be known prior to runtime
-
+export interface CommandNote {
+  noteKind: 'warning' | 'information' | string
+  shortMessage: string
+  longMessage: string
+  source: string
+}
 export type CommandStatus = 'queued' | 'running' | 'succeeded' | 'failed'
 export interface CommonCommandRunTimeInfo {
   key?: string
@@ -42,6 +47,7 @@ export interface CommonCommandRunTimeInfo {
   startedAt: string | null
   completedAt: string | null
   intent?: 'protocol' | 'setup'
+  notes?: CommandNote[] | null
 }
 export interface CommonCommandCreateInfo {
   key?: string

package/command/types/pipetting.ts

@@ -282,6 +282,7 @@ interface WellLocationParam {
 
 interface VerifyTipPresenceParams extends PipetteIdentityParams {
   expectedState?: 'present' | 'absent'
+  followSingularSensor?: 'primary' | 'secondary'
 }
 
 interface BasicLiquidHandlingResult {

package/deck/definitions/5/ot2_short_trash.json

@@ -0,0 +1,409 @@
+{
+  "otId": "ot2_short_trash",
+  "schemaVersion": 5,
+  "cornerOffsetFromOrigin": [-115.65, -68.03, 0],
+  "dimensions": [624.3, 565.2, 0],
+  "metadata": {
+    "displayName": "OT-2 Short-Trash Deck",
+    "tags": ["ot2", "12 slots", "short trash"]
+  },
+  "robot": {
+    "model": "OT-2 Standard"
+  },
+  "locations": {
+    "addressableAreas": [
+      {
+        "id": "1",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 1",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "2",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 2",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "3",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 3",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "4",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 4",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "5",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 5",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "6",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 6",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "7",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 7",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "thermocyclerModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "8",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 8",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "9",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 9",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "10",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 10",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "11",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "matingSurfaceUnitVector": [-1, 1, -1],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 11",
+        "compatibleModuleTypes": [
+          "magneticModuleType",
+          "temperatureModuleType",
+          "heaterShakerModuleType"
+        ]
+      },
+      {
+        "id": "12",
+        "areaType": "slot",
+        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "boundingBox": {
+          "xDimension": 128.0,
+          "yDimension": 86.0,
+          "zDimension": 0
+        },
+        "displayName": "Slot 12",
+        "compatibleModuleTypes": []
+      },
+      {
+        "id": "shortFixedTrash",
+        "areaType": "fixedTrash",
+        "offsetFromCutoutFixture": [29.285, -2.835, 0],
+        "boundingBox": {
+          "xDimension": 107.11,
+          "yDimension": 165.67,
+          "zDimension": 58
+        },
+        "displayName": "Slot 12/Short Fixed Trash",
+        "ableToDropTips": true
+      }
+    ],
+    "cutouts": [
+      {
+        "id": "cutout1",
+        "position": [0.0, 0.0, 0.0],
+        "displayName": "Cutout 1"
+      },
+      {
+        "id": "cutout2",
+        "position": [132.5, 0.0, 0.0],
+        "displayName": "Cutout 2"
+      },
+      {
+        "id": "cutout3",
+        "position": [265.0, 0.0, 0.0],
+        "displayName": "Cutout 3"
+      },
+      {
+        "id": "cutout4",
+        "position": [0.0, 90.5, 0.0],
+        "displayName": "Cutout 4"
+      },
+      {
+        "id": "cutout5",
+        "position": [132.5, 90.5, 0.0],
+        "displayName": "Cutout 5"
+      },
+      {
+        "id": "cutout6",
+        "position": [265.0, 90.5, 0.0],
+        "displayName": "Cutout 6"
+      },
+      {
+        "id": "cutout7",
+        "position": [0.0, 181.0, 0.0],
+        "displayName": "Cutout 7"
+      },
+      {
+        "id": "cutout8",
+        "position": [132.5, 181.0, 0.0],
+        "displayName": "Cutout 8"
+      },
+      {
+        "id": "cutout9",
+        "position": [265.0, 181.0, 0.0],
+        "displayName": "Cutout 9"
+      },
+      {
+        "id": "cutout10",
+        "position": [0.0, 271.5, 0.0],
+        "displayName": "Slot 10"
+      },
+      {
+        "id": "cutout11",
+        "position": [132.5, 271.5, 0.0],
+        "displayName": "Cutout 11"
+      },
+      {
+        "id": "cutout12",
+        "position": [265.0, 271.5, 0.0],
+        "displayName": "Cutout 12"
+      }
+    ],
+    "calibrationPoints": [
+      {
+        "id": "1BLC",
+        "position": [12.13, 9.0, 0.0],
+        "displayName": "Slot 1 Bottom Left Cross"
+      },
+      {
+        "id": "3BRC",
+        "position": [380.87, 9.0, 0.0],
+        "displayName": "Slot 3 Bottom Right Cross"
+      },
+      {
+        "id": "7TLC",
+        "position": [12.13, 258.0, 0.0],
+        "displayName": "Slot 7 Top Left Cross"
+      },
+      {
+        "id": "9TRC",
+        "position": [380.87, 258.0, 0.0],
+        "displayName": "Slot 9 Top Right Cross"
+      },
+      {
+        "id": "10TLC",
+        "position": [12.13, 348.5, 0.0],
+        "displayName": "Slot 10 Top Left Cross"
+      },
+      {
+        "id": "11TRC",
+        "position": [248.37, 348.5, 0.0],
+        "displayName": "Slot 11 Top Right Cross"
+      },
+      {
+        "id": "1BLD",
+        "position": [12.13, 6.0, 0.0],
+        "displayName": "Slot 1 Bottom Left Dot"
+      },
+      {
+        "id": "3BRD",
+        "position": [380.87, 6.0, 0.0],
+        "displayName": "Slot 3 Bottom Right Dot"
+      },
+      {
+        "id": "7TLD",
+        "position": [12.13, 261.0, 0.0],
+        "displayName": "Slot 7 Top Left Dot"
+      },
+      {
+        "id": "9TRD",
+        "position": [380.87, 261.0, 0.0],
+        "displayName": "Slot 9 Top Right Dot"
+      },
+      {
+        "id": "10TLD",
+        "position": [12.13, 351.5, 0.0],
+        "displayName": "Slot 10 Top Left Dot"
+      },
+      {
+        "id": "11TRD",
+        "position": [248.37, 351.5, 0.0],
+        "displayName": "Slot 11 Top Right Dot"
+      }
+    ],
+    "legacyFixtures": [
+      {
+        "id": "fixedTrash",
+        "slot": "12",
+        "labware": "opentrons_1_trash_850ml_fixed",
+        "displayName": "Fixed Trash"
+      }
+    ]
+  },
+  "cutoutFixtures": [
+    {
+      "id": "singleStandardSlot",
+      "expectOpentronsModuleSerialNumber": false,
+      "mayMountTo": [
+        "cutout1",
+        "cutout2",
+        "cutout3",
+        "cutout4",
+        "cutout5",
+        "cutout6",
+        "cutout7",
+        "cutout8",
+        "cutout9",
+        "cutout10",
+        "cutout11",
+        "cutout12"
+      ],
+      "displayName": "Standard Slot",
+      "providesAddressableAreas": {
+        "cutout1": ["1"],
+        "cutout2": ["2"],
+        "cutout3": ["3"],
+        "cutout4": ["4"],
+        "cutout5": ["5"],
+        "cutout6": ["6"],
+        "cutout7": ["7"],
+        "cutout8": ["8"],
+        "cutout9": ["9"],
+        "cutout10": ["10"],
+        "cutout11": ["11"],
+        "cutout12": ["12"]
+      },
+      "fixtureGroup": {},
+      "height": 0
+    },
+    {
+      "id": "fixedTrashSlot",
+      "expectOpentronsModuleSerialNumber": false,
+      "mayMountTo": ["cutout12"],
+      "displayName": "Fixed Trash",
+      "providesAddressableAreas": {
+        "cutout12": ["shortFixedTrash"]
+      },
+      "fixtureGroup": {},
+      "height": 58
+    }
+  ]
+}