opentrons 9.0.0a0__tar.gz → 9.0.0a1__tar.gz

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentrons
-Version: 9.0.0a0
+Version: 9.0.0a1
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Project-URL: opentrons.com, https://www.opentrons.com
 Project-URL: Source Code On Github, https://github.com/Opentrons/opentrons/tree/edge/api
@@ -25,7 +25,7 @@ Requires-Dist: importlib-metadata>=1.0; python_version < '3.8'
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
 Requires-Dist: numpy<2,>=1.20.0
 Requires-Dist: numpy<2,>=1.26.4
-Requires-Dist: opentrons-shared-data==9.0.0a0
+Requires-Dist: opentrons-shared-data==9.0.0a1
 Requires-Dist: packaging>=25.0
 Requires-Dist: pydantic-settings<3,>=2
 Requires-Dist: pydantic<3,>=2.0.0

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/src/opentrons/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '9.0.0a0'
-__version_tuple__ = version_tuple = (9, 0, 0, 'a0')
+__version__ = version = '9.0.0a1'
+__version_tuple__ = version_tuple = (9, 0, 0, 'a1')
 
 __commit_id__ = commit_id = None

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/src/opentrons/protocol_api/_liquid_properties.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Dict, List, Optional, Sequence, Tuple, Union
 
 from numpy import interp
+from pydantic import ValidationError
 
 from opentrons_shared_data.liquid_classes.liquid_class_definition import (
     AspirateProperties as SharedDataAspirateProperties,
@@ -696,15 +697,11 @@ def _ensure_validated_tip_position(
     if isinstance(tip_position, TipPosition):
         return tip_position
     elif isinstance(tip_position, dict):
-        # Use setters of TipPosition so we can get the validators for free
-        _pos = TipPosition(
-            _position_reference=PositionReference.WELL_TOP,
-            _offset=Coordinate(x=0, y=0, z=0),
-        )
-        _pos.position_reference = tip_position.get("position_reference")
-        offset = tip_position.get("offset")
-        _pos.offset = Coordinate(x=offset["x"], y=offset["y"], z=offset["z"])
-        return _pos
+        try:
+            pos = SharedDataTipPosition.model_validate(tip_position)
+        except ValidationError as e:
+            raise ValueError(f"Invalid tip position: {e}") from e
+        return _build_tip_position(pos)
     else:
         raise TypeError(
             f"Tip position should be an instance of `TipPosition` or of type `TipPositionDict`, but got {tip_position}"

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/src/opentrons/protocol_engine/state/module_substates/thermocycler_module_substate.py

@@ -166,7 +166,12 @@ class ThermocyclerModuleSubState:
         if ramp_rate is None:
             return ramp_rate
 
-        heating = target_temp > self.get_target_block_temperature()
+        if self.target_block_temperature:
+            heating = target_temp > self.get_target_block_temperature()
+        else:
+            # When we're simulating we don't load the TC from live data so there is no default
+            # target temperature.
+            heating = target_temp > 20
         if (heating and ramp_rate > MAX_HEATING_RATE) or (
             not heating and ramp_rate > MAX_COOLING_RATE
         ):

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/tests/opentrons/protocol_api/test_liquid_class_properties.py

@@ -537,10 +537,24 @@ def test_ensure_validated_tip_position(
     validated_position = _ensure_validated_tip_position(tip_position)
     assert validated_position == expected_position
 
+
+def test_ensure_validated_tip_position_raises_error() -> None:
+    """It should raise an error if the tip position is invalid."""
     with pytest.raises(TypeError):
         _ensure_validated_tip_position("invalid_tip_position")  # type: ignore[arg-type]
 
-    with pytest.raises(ValueError):
+    with pytest.raises(
+        ValueError,
+        match="Input should be 'well-bottom', 'well-top', 'well-center' or 'liquid-meniscus'",
+    ):
         _ensure_validated_tip_position(
             {"position_reference": "invalid", "offset": {"x": 10, "y": 20, "z": 30}}  # type: ignore[arg-type]
         )
+
+    with pytest.raises(ValueError, match="Extra inputs are not permitted"):
+        _ensure_validated_tip_position(
+            {  # type: ignore[arg-type]
+                "position_reference": "well-bottom",
+                "offset": {"x": 10, "y": 20, "z": 30, "w": 3},
+            }
+        )

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/tests/opentrons/protocol_api_integration/test_liquid_classes.py

@@ -156,11 +156,8 @@ def test_adding_blowout_position_to_liquid_classes(
     custom_water_props.dispense.retract.blowout.blowout_position = None
     assert custom_water_props.dispense.retract.blowout.blowout_position is None
 
-    custom_water_props.dispense.retract.blowout.blowout_position = {  # type:ignore[assignment]
-        "position_reference": "well-top",
-        "offset": {"x": 11, "y": 22, "z": 33, "w": 123},
-    }
-    assert (
-        custom_water_props.dispense.retract.blowout.blowout_position.offset  # type:ignore[union-attr]
-        == Coordinate(x=11, y=22, z=33)
-    )
+    with pytest.raises(ValueError):
+        custom_water_props.dispense.retract.blowout.blowout_position = {  # type:ignore[assignment]
+            "position_reference": "well-top",
+            "offset": {"x": 11, "y": 22, "z": 33, "w": 123},
+        }

{opentrons-9.0.0a0 → opentrons-9.0.0a1}/tests/opentrons/protocol_engine/state/test_module_view_old.py

@@ -1695,6 +1695,31 @@ def test_thermocycler_validate_target_lid_temperature(
     assert result == input_temperature
 
 
+def test_thermocycler_validate_ramp_rate(
+    module_view_with_thermocycler: ModuleView,
+) -> None:
+    """It should return a valid target block temperature."""
+    subject = module_view_with_thermocycler.get_thermocycler_module_substate(
+        "module-id"
+    )
+    # Make sure we pass before any block temp is set.
+
+    result = subject.validate_ramp_rate(ramp_rate=1.0, target_temp=100)
+    assert result == 1.0
+
+    # exceeding the max while heating.
+    with pytest.raises(errors.InvalidRampRateError):
+        subject.validate_ramp_rate(ramp_rate=5.0, target_temp=100)
+
+    # exceeding the max while cooling.
+    with pytest.raises(errors.InvalidRampRateError):
+        subject.validate_ramp_rate(ramp_rate=3.6, target_temp=0)
+
+    # must be positive.
+    with pytest.raises(errors.InvalidRampRateError):
+        subject.validate_ramp_rate(ramp_rate=-0.1, target_temp=0)
+
+
 @pytest.mark.parametrize("input_temperature", [36.999, 110.001])
 def test_thermocycler_validate_target_lid_temperature_raises(
     module_view_with_thermocycler: ModuleView,