@opentrons/shared-data 0.0.0-alpha.2 → 0.0.1-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/shared-data",
-  "version": "0.0.0-alpha.2",
+  "version": "0.0.1-alpha.17",
   "description": "Shared system definitions and utilities for Opentrons robots and software",
   "repository": {
     "type": "git",
@@ -10,7 +10,8 @@
   "license": "Apache-2.0",
   "source": "js/index.ts",
   "types": "lib/js/index.d.ts",
-  "flow:main": "flow-types/js/index.js.flow",
+  "main": "lib/opentrons-shared-data.js",
+  "module": "js/index.ts",
   "dependencies": {
     "ajv": "^6.12.3",
     "html-react-parser": "^1.2.8",

package/python/opentrons_shared_data/gripper/constants.py

@@ -3,3 +3,4 @@
 LABWARE_GRIP_FORCE = 15.0  # Newtons
 GRIPPER_DECK_DROP_OFFSET = [-0.5, -0.5, -1.5]
 GRIPPER_MODULE_DROP_OFFSET = [0.0, 0.0, 1.5]
+GRIPPER_PADDLE_WIDTH = 36  # mm

package/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py

@@ -139,7 +139,11 @@ def generation_from_string(pipette_name_list: List[str]) -> PipetteGenerationTyp
         PipetteGenerationType: A pipette version object.
 
     """
-    if "flex" in pipette_name_list or "3." in pipette_name_list[-1]:
+    if (
+        "flex" in pipette_name_list
+        or "3." in pipette_name_list[-1]
+        or pipette_name_list == ["p1000", "96"]
+    ):
         return PipetteGenerationType.FLEX
     elif "gen2" in pipette_name_list or "2." in pipette_name_list[-1]:
         return PipetteGenerationType.GEN2

package/python/opentrons_shared_data/protocol/models/protocol_schema_v8.py

@@ -13,6 +13,7 @@ from .shared_models import (
     Metadata,
     DesignerApplication,
     Robot,
+    NozzleConfigurationParams,
 )
 
 
@@ -67,6 +68,7 @@ class Params(BaseModel):
     dropOffset: Optional[OffsetVector]
     # schema v8 add-ons
     addressableAreaName: Optional[str]
+    configurationParams: Optional[NozzleConfigurationParams]
 
 
 class Command(BaseModel):

package/python/opentrons_shared_data/protocol/models/shared_models.py

@@ -103,3 +103,9 @@ class Liquid(BaseModel):
 class Labware(BaseModel):
     displayName: Optional[str]
     definitionId: str
+
+
+class NozzleConfigurationParams(BaseModel):
+    style: str
+    primaryNozzle: Optional[str]
+    frontRightNozzle: Optional[str]

package/python/opentrons_shared_data/robot/__init__.py

@@ -23,3 +23,11 @@ def load(
         if defn["robotType"] == robot_type:
             return cast(RobotDefinition, defn)
     raise KeyError(robot_type)
+
+
+def user_facing_robot_type(robot_type: RobotType, include_article: bool = False) -> str:
+    """Appropriately formatted robot type string for use in user-facing messages."""
+    if robot_type == "OT-2 Standard":
+        return "an OT-2" if include_article else "OT-2"
+    elif robot_type == "OT-3 Standard":
+        return "a Flex" if include_article else "Flex"

package/webpack.config.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const path = require('path')
+const webpackMerge = require('webpack-merge')
+const { baseConfig } = require('@opentrons/webpack-config')
+
+const ENTRY_INDEX = path.join(__dirname, 'js/index.ts')
+const OUTPUT_PATH = path.join(__dirname, 'lib')
+
+module.exports = async () =>
+  webpackMerge(baseConfig, {
+    entry: { index: ENTRY_INDEX },
+    output: {
+      ...baseConfig.output,
+      path: OUTPUT_PATH,
+      library: '@opentrons/shared-data',
+      libraryTarget: 'umd'
+    },
+  })

package/js/scripts/build.js

@@ -1,32 +0,0 @@
-// This build script is run by `make setup`
-
-// Merge all v1 labware files into a single JSON file, build/labware.json,
-// with each filename as a key in the final JSON file.
-const fs = require('fs')
-const path = require('path')
-const glob = require('glob')
-
-const buildDir = process.argv[2]
-
-if (!buildDir) {
-  throw new Error(
-    'build.js requires a build directory given as an argument. eg `node js/scripts/build.js path/to/build/`'
-  )
-}
-
-const output = {}
-
-const files = glob.sync(
-  path.join(__dirname, '../../labware/definitions/1/*.json')
-)
-
-files.forEach(filename => {
-  const contents = require(filename)
-  const labwareName = path.parse(filename).name
-
-  output[labwareName] = contents
-})
-
-const jsonOutput = JSON.stringify(output)
-
-fs.writeFileSync(path.join(buildDir, 'labware.json'), jsonOutput)