changes to models supplied

Realistically the whole deck definition base class will be utilized to create the deck "instance", everything else derives from that.
Opentrons · Oct 25, 2023 · 354f656 · 354f656
1 parent cb592b0
commit 354f656
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/api/src/opentrons/protocol_engine/resources/fixture_validation.py b/api/src/opentrons/protocol_engine/resources/fixture_validation.py
@@ -2,8 +2,7 @@
 
 from typing import List
 
-from opentrons_shared_data.deck.deck_definitions import Locations
-from opentrons.protocols.models import CutoutFixture
+from opentrons_shared_data.deck.deck_definitions import Locations, CutoutFixture
 from opentrons.hardware_control.modules.types import ModuleModel, ModuleType
 
 

diff --git a/api/src/opentrons/protocols/models/__init__.py b/api/src/opentrons/protocols/models/__init__.py
@@ -13,13 +13,13 @@
     WellDefinition,
 )
 from opentrons_shared_data.deck.deck_definitions import (
-    CutoutFixture,
+    DeckDefinition,
 )
 from .json_protocol import Model as JsonProtocol
 
 __all__ = [
     "LabwareDefinition",
     "WellDefinition",
-    "CutoutFixture",
+    "DeckDefinition",
     "JsonProtocol",
 ]
diff --git a/shared-data/python/opentrons_shared_data/deck/deck_definitions.py b/shared-data/python/opentrons_shared_data/deck/deck_definitions.py
@@ -181,7 +181,7 @@ class GripperOffsets(BaseModel):
     default: Default
 
 
-class Deck(BaseModel):
+class DeckDefinition(BaseModel):
     class Config:
         extra = Extra.forbid