Update Python and TypeScript bindings.

Author: SyntaxColoring

shared-data/js/types.ts

@@ -263,6 +263,7 @@ export interface LabwareDefinition2 {
 
 export interface LabwareDefinition3 {
   version: number
+  $otSharedSchema: '#/labware/schemas/3'
   schemaVersion: 3
   namespace: string
   metadata: LabwareMetadata

shared-data/python/opentrons_shared_data/labware/labware_definition.py

@@ -684,6 +684,18 @@ class InnerWellGeometry(BaseModel):
 
 
 class LabwareDefinition(BaseModel):
+    model_config = {
+        # `"extra": "allow"` gives us lossless preservation of the $otSharedSchema field
+        # (which should always be omitted in schema 2 and always be present in schema 3)
+        # across parse/serialize round trips. Pydantic doesn't seem to have a good way
+        # of doing that when the $otSharedSchema field is declared explicitly on this
+        # model.
+        #
+        # Splitting this model into separate ones for schema 2 and 3 would also solve this.
+        "extra": "allow"
+    }
+
+    # $otSharedSchema deliberately omitted for now. See `"extra": "allow"` in model_config.
     schemaVersion: Literal[1, 2, 3] = Field(
         ..., description="Which schema version a labware is using"
     )

shared-data/python/opentrons_shared_data/labware/types.py

@@ -125,6 +125,8 @@ class WellGroup(TypedDict, total=False):
 
 
 class LabwareDefinition(TypedDict):
+    # $otSharedSchema omitted because the dollar sign makes it annoying to include
+    # here and nothing needs it yet, anyway.
     schemaVersion: Literal[2, 3]
     version: int
     namespace: str