opentrons 8.2.0a4__py2.py3-none-any.whl → 8.3.0a1__py2.py3-none-any.whl

opentrons/protocol_api/_liquid.py

@@ -1,13 +1,15 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
-from typing import Optional, Sequence
+from typing import Optional, Dict
 
 from opentrons_shared_data.liquid_classes.liquid_class_definition import (
     LiquidClassSchemaV1,
-    AspirateProperties,
-    SingleDispenseProperties,
-    MultiDispenseProperties,
-    ByPipetteSetting,
-    ByTipTypeSetting,
+)
+
+from ._liquid_properties import (
+    TransferProperties,
+    build_transfer_properties,
 )
 
 
@@ -29,46 +31,29 @@ class Liquid:
     display_color: Optional[str]
 
 
-# TODO (spp, 2024-10-17): create PAPI-equivalent types for all the properties
-#  and have validation on value updates with user-facing error messages
-@dataclass
-class TransferProperties:
-    _aspirate: AspirateProperties
-    _dispense: SingleDispenseProperties
-    _multi_dispense: Optional[MultiDispenseProperties]
-
-    @property
-    def aspirate(self) -> AspirateProperties:
-        """Aspirate properties."""
-        return self._aspirate
-
-    @property
-    def dispense(self) -> SingleDispenseProperties:
-        """Single dispense properties."""
-        return self._dispense
-
-    @property
-    def multi_dispense(self) -> Optional[MultiDispenseProperties]:
-        """Multi dispense properties."""
-        return self._multi_dispense
-
-
 @dataclass
 class LiquidClass:
     """A data class that contains properties of a specific class of liquids."""
 
     _name: str
     _display_name: str
-    _by_pipette_setting: Sequence[ByPipetteSetting]
+    _by_pipette_setting: Dict[str, Dict[str, TransferProperties]]
 
     @classmethod
     def create(cls, liquid_class_definition: LiquidClassSchemaV1) -> "LiquidClass":
         """Liquid class factory method."""
 
+        by_pipette_settings: Dict[str, Dict[str, TransferProperties]] = {}
+        for by_pipette in liquid_class_definition.byPipette:
+            tip_settings: Dict[str, TransferProperties] = {}
+            for tip_type in by_pipette.byTipType:
+                tip_settings[tip_type.tiprack] = build_transfer_properties(tip_type)
+            by_pipette_settings[by_pipette.pipetteModel] = tip_settings
+
         return cls(
             _name=liquid_class_definition.liquidClassName,
             _display_name=liquid_class_definition.displayName,
-            _by_pipette_setting=liquid_class_definition.byPipette,
+            _by_pipette_setting=by_pipette_settings,
         )
 
     @property
@@ -81,26 +66,16 @@ class LiquidClass:
 
     def get_for(self, pipette: str, tiprack: str) -> TransferProperties:
         """Get liquid class transfer properties for the specified pipette and tip."""
-        settings_for_pipette: Sequence[ByPipetteSetting] = [
-            pip_setting
-            for pip_setting in self._by_pipette_setting
-            if pip_setting.pipetteModel == pipette
-        ]
-        if len(settings_for_pipette) == 0:
+        try:
+            settings_for_pipette = self._by_pipette_setting[pipette]
+        except KeyError:
             raise ValueError(
                 f"No properties found for {pipette} in {self._name} liquid class"
             )
-        settings_for_tip: Sequence[ByTipTypeSetting] = [
-            tip_setting
-            for tip_setting in settings_for_pipette[0].byTipType
-            if tip_setting.tiprack == tiprack
-        ]
-        if len(settings_for_tip) == 0:
+        try:
+            transfer_properties = settings_for_pipette[tiprack]
+        except KeyError:
             raise ValueError(
                 f"No properties found for {tiprack} in {self._name} liquid class"
             )
-        return TransferProperties(
-            _aspirate=settings_for_tip[0].aspirate,
-            _dispense=settings_for_tip[0].singleDispense,
-            _multi_dispense=settings_for_tip[0].multiDispense,
-        )
+        return transfer_properties