schema structure changes

shared-data/labware/schemas/3.json

@@ -67,6 +67,7 @@
     },
     "CircularCrossSection": {
       "type": "object",
+      "required": ["shape", "diameter"],
       "properties": {
         "shape": {
           "type": "string",
@@ -79,6 +80,7 @@
     },
     "RectangularCrossSection": {
       "type": "object",
+      "required": ["shape", "xDimension", "yDimension"],
       "properties": {
         "shape": {
           "type": "string",
@@ -94,6 +96,7 @@
     },
     "SphericalSegment": {
       "type": "object",
+      "required": ["shape", "radiusOfCurvature", "depth"],
       "properties": {
         "shape": {
           "type": "string",
@@ -462,7 +465,7 @@
       "description": "Recommended Z-height, from labware bottom to the center of gripper pads, when gripping the labware."
     },
     "innerLabwareGeometry": {
-      "type": "object",
+      "type": ["object", "null"],
       "description": "A dictionary holding all unique inner well geometries in a labware.",
       "additionalProperties": {
         "$ref": "#/definitions/InnerWellGeometry"

shared-data/python/tests/labware/__init__.py

@@ -20,4 +20,4 @@ def get_ot_defs_3() -> List[Tuple[str, int]]:
             Path(__file__).parent / ".." / ".." / ".." / "labware" / "definitions" / "3"
     ).glob("**/*.json")
     return [(f.parent.name, int(f.stem)) for f in def_files]
-"""
+"""