opentrons 8.7.0a7__py3-none-any.whl → 8.7.0a8__py3-none-any.whl

opentrons/protocol_engine/commands/temperature_module/set_target_temperature.py

@@ -1,35 +1,25 @@
 """Command models to start heating a Temperature Module."""
 from __future__ import annotations
-from typing import Optional, TYPE_CHECKING, Any
+from typing import Optional, TYPE_CHECKING
 from typing_extensions import Literal, Type
 
 from pydantic import BaseModel, Field
-from pydantic.json_schema import SkipJsonSchema
 
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors.error_occurrence import ErrorOccurrence
 
 if TYPE_CHECKING:
     from opentrons.protocol_engine.state.state import StateView
-    from opentrons.protocol_engine.execution import EquipmentHandler, TaskHandler
+    from opentrons.protocol_engine.execution import EquipmentHandler
 
 SetTargetTemperatureCommandType = Literal["temperatureModule/setTargetTemperature"]
 
 
-def _remove_default(s: dict[str, Any]) -> None:
-    s.pop("default", None)
-
-
 class SetTargetTemperatureParams(BaseModel):
     """Input parameters to set a Temperature Module's target temperature."""
 
     moduleId: str = Field(..., description="Unique ID of the Temperature Module.")
     celsius: float = Field(..., description="Target temperature in °C.")
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="Id for the background task that manages the temperature",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetTemperatureResult(BaseModel):
@@ -40,11 +30,6 @@ class SetTargetTemperatureResult(BaseModel):
         description="The target temperature that was set after validation "
         "and type conversion (if any).",
     )
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="The task id for the setTargetTemperature task",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetTemperatureImpl(
@@ -58,12 +43,10 @@ class SetTargetTemperatureImpl(
         self,
         state_view: StateView,
         equipment: EquipmentHandler,
-        task_handler: TaskHandler,
         **unused_dependencies: object,
     ) -> None:
         self._state_view = state_view
         self._equipment = equipment
-        self._task_handler = task_handler
 
     async def execute(
         self, params: SetTargetTemperatureParams
@@ -73,33 +56,19 @@ class SetTargetTemperatureImpl(
         module_substate = self._state_view.modules.get_temperature_module_substate(
             module_id=params.moduleId
         )
+
         # Verify temperature from temperature module view
         validated_temp = module_substate.validate_target_temperature(params.celsius)
+
         # Allow propagation of ModuleNotAttachedError.
         temp_hardware_module = self._equipment.get_module_hardware_api(
             module_substate.module_id
         )
 
-        async def start_set_temperature(task_handler: TaskHandler) -> None:
-            if temp_hardware_module is not None:
-                async with task_handler.synchronize_cancel_previous(
-                    module_substate.module_id
-                ):
-                    await temp_hardware_module.start_set_temperature(
-                        celsius=validated_temp
-                    )
-                    await temp_hardware_module.await_temperature(
-                        awaiting_temperature=validated_temp
-                    )
-
-        task = await self._task_handler.create_task(
-            task_function=start_set_temperature, id=params.taskId
-        )
-
+        if temp_hardware_module is not None:
+            await temp_hardware_module.start_set_temperature(celsius=validated_temp)
         return SuccessData(
-            public=SetTargetTemperatureResult(
-                targetTemperature=validated_temp, taskId=task.id
-            ),
+            public=SetTargetTemperatureResult(targetTemperature=validated_temp),
         )
 
 

opentrons/protocol_engine/commands/thermocycler/__init__.py

@@ -73,15 +73,6 @@ from .run_profile import (
     RunProfileCreate,
 )
 
-from .start_run_extended_profile import (
-    StartRunExtendedProfileCommandType,
-    StartRunExtendedProfileParams,
-    StartRunExtendedProfileStepParams,
-    StartRunExtendedProfileResult,
-    StartRunExtendedProfile,
-    StartRunExtendedProfileCreate,
-)
-
 from .run_extended_profile import (
     RunExtendedProfileCommandType,
     RunExtendedProfileParams,
@@ -149,13 +140,6 @@ __all__ = [
     "RunProfileResult",
     "RunProfile",
     "RunProfileCreate",
-    # Start run profile command models,
-    "StartRunExtendedProfileCommandType",
-    "StartRunExtendedProfileParams",
-    "StartRunExtendedProfileStepParams",
-    "StartRunExtendedProfileResult",
-    "StartRunExtendedProfile",
-    "StartRunExtendedProfileCreate",
     # Run extended profile command models.
     "RunExtendedProfileCommandType",
     "RunExtendedProfileParams",

opentrons/protocol_engine/commands/thermocycler/run_extended_profile.py

@@ -33,11 +33,6 @@ class ProfileStep(BaseModel):
     holdSeconds: float = Field(
         ..., description="Time to hold target temperature in seconds."
     )
-    rampRate: float | SkipJsonSchema[None] = Field(
-        None,
-        description="How quickly to change temperature in °C/second.",
-        json_schema_extra=_remove_default,
-    )
 
 
 class ProfileCycle(BaseModel):
@@ -73,7 +68,6 @@ def _transform_profile_step(
     return ThermocyclerStep(
         temperature=thermocycler_state.validate_target_block_temperature(step.celsius),
         hold_time_seconds=step.holdSeconds,
-        ramp_rate=thermocycler_state.validate_ramp_rate(step.rampRate, step.celsius),
     )
 
 

opentrons/protocol_engine/commands/thermocycler/run_profile.py

@@ -30,11 +30,6 @@ class RunProfileStepParams(BaseModel):
     holdSeconds: float = Field(
         ..., description="Time to hold target temperature at in seconds."
     )
-    rampRate: float | SkipJsonSchema[None] = Field(
-        None,
-        description="How quickly to change temperature in °C/second.",
-        json_schema_extra=_remove_default,
-    )
 
 
 class RunProfileParams(BaseModel):
@@ -86,9 +81,6 @@ class RunProfileImpl(
                     profile_step.celsius
                 ),
                 hold_time_seconds=profile_step.holdSeconds,
-                ramp_rate=thermocycler_state.validate_ramp_rate(
-                    profile_step.rampRate, profile_step.celsius
-                ),
             )
             for profile_step in params.profile
         ]

opentrons/protocol_engine/commands/thermocycler/set_target_block_temperature.py

@@ -11,7 +11,7 @@ from ...errors.error_occurrence import ErrorOccurrence
 
 if TYPE_CHECKING:
     from opentrons.protocol_engine.state.state import StateView
-    from opentrons.protocol_engine.execution import EquipmentHandler, TaskHandler
+    from opentrons.protocol_engine.execution import EquipmentHandler
 
 
 SetTargetBlockTemperatureCommandType = Literal["thermocycler/setTargetBlockTemperature"]
@@ -39,17 +39,6 @@ class SetTargetBlockTemperatureParams(BaseModel):
         " the given hold time has elapsed.",
         json_schema_extra=_remove_default,
     )
-    ramp_rate: float | SkipJsonSchema[None] = Field(
-        None,
-        description="The rate in C°/second to change temperature from the current target."
-        " If unspecified, the Thermocycler will change temperature at the fastest possible rate.",
-        json_schema_extra=_remove_default,
-    )
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="Id for the background task that manages the temperature.",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetBlockTemperatureResult(BaseModel):
@@ -59,11 +48,6 @@ class SetTargetBlockTemperatureResult(BaseModel):
         ...,
         description="The target block temperature that was set after validation.",
     )
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="The task id for the setTargetBlockTemperature",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetBlockTemperatureImpl(
@@ -78,12 +62,10 @@ class SetTargetBlockTemperatureImpl(
         self,
         state_view: StateView,
         equipment: EquipmentHandler,
-        task_handler: TaskHandler,
         **unused_dependencies: object,
     ) -> None:
         self._state_view = state_view
         self._equipment = equipment
-        self._task_handler = task_handler
 
     async def execute(
         self,
@@ -108,35 +90,19 @@ class SetTargetBlockTemperatureImpl(
             hold_time = thermocycler_state.validate_hold_time(params.holdTimeSeconds)
         else:
             hold_time = None
-        target_ramp_rate: Optional[float]
-        if params.ramp_rate is not None:
-            target_ramp_rate = thermocycler_state.validate_ramp_rate(
-                params.ramp_rate, target_temperature
-            )
-        else:
-            target_ramp_rate = None
 
         thermocycler_hardware = self._equipment.get_module_hardware_api(
             thermocycler_state.module_id
         )
 
-        async def set_target_block_temperature(task_handler: TaskHandler) -> None:
-            if thermocycler_hardware is not None:
-                await thermocycler_hardware.set_target_block_temperature(
-                    target_temperature,
-                    volume=target_volume,
-                    hold_time_seconds=hold_time,
-                    ramp_rate=target_ramp_rate,
-                )
-                await thermocycler_hardware.wait_for_block_target()
-
-        task = await self._task_handler.create_task(
-            task_function=set_target_block_temperature, id=params.taskId
-        )
+        if thermocycler_hardware is not None:
+            await thermocycler_hardware.set_target_block_temperature(
+                target_temperature, volume=target_volume, hold_time_seconds=hold_time
+            )
 
         return SuccessData(
             public=SetTargetBlockTemperatureResult(
-                targetBlockTemperature=target_temperature, taskId=task.id
+                targetBlockTemperature=target_temperature
             ),
         )
 

opentrons/protocol_engine/commands/thermocycler/set_target_lid_temperature.py

@@ -1,36 +1,26 @@
 """Command models to start heating a Thermocycler's lid."""
 from __future__ import annotations
-from typing import Optional, TYPE_CHECKING, Any
+from typing import Optional, TYPE_CHECKING
 from typing_extensions import Literal, Type
 
 from pydantic import BaseModel, Field
-from pydantic.json_schema import SkipJsonSchema
 
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors.error_occurrence import ErrorOccurrence
 
 if TYPE_CHECKING:
     from opentrons.protocol_engine.state.state import StateView
-    from opentrons.protocol_engine.execution import EquipmentHandler, TaskHandler
+    from opentrons.protocol_engine.execution import EquipmentHandler
 
 
 SetTargetLidTemperatureCommandType = Literal["thermocycler/setTargetLidTemperature"]
 
 
-def _remove_default(s: dict[str, Any]) -> None:
-    s.pop("default", None)
-
-
 class SetTargetLidTemperatureParams(BaseModel):
     """Input parameters to set a Thermocycler's target lid temperature."""
 
     moduleId: str = Field(..., description="Unique ID of the Thermocycler Module.")
     celsius: float = Field(..., description="Target temperature in °C.")
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="Id for the background task that manages the temperature.",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetLidTemperatureResult(BaseModel):
@@ -40,11 +30,6 @@ class SetTargetLidTemperatureResult(BaseModel):
         ...,
         description="The target lid temperature that was set after validation.",
     )
-    taskId: str | SkipJsonSchema[None] = Field(
-        None,
-        description="The task id for the setTargetBlockTemperature",
-        json_schema_extra=_remove_default,
-    )
 
 
 class SetTargetLidTemperatureImpl(
@@ -58,12 +43,10 @@ class SetTargetLidTemperatureImpl(
         self,
         state_view: StateView,
         equipment: EquipmentHandler,
-        task_handler: TaskHandler,
         **unused_dependencies: object,
     ) -> None:
         self._state_view = state_view
         self._equipment = equipment
-        self._task_handler = task_handler
 
     async def execute(
         self,
@@ -80,19 +63,12 @@ class SetTargetLidTemperatureImpl(
             thermocycler_state.module_id
         )
 
-        async def set_target_lid_temperature(task_handler: TaskHandler) -> None:
-            if thermocycler_hardware is not None:
-                await thermocycler_hardware.set_target_lid_temperature(
-                    target_temperature
-                )
-                await thermocycler_hardware.wait_for_lid_target()
+        if thermocycler_hardware is not None:
+            await thermocycler_hardware.set_target_lid_temperature(target_temperature)
 
-        task = await self._task_handler.create_task(
-            task_function=set_target_lid_temperature, id=params.taskId
-        )
         return SuccessData(
             public=SetTargetLidTemperatureResult(
-                targetLidTemperature=target_temperature, taskId=task.id
+                targetLidTemperature=target_temperature
             ),
         )
 

opentrons/protocol_engine/commands/touch_tip.py

@@ -114,7 +114,7 @@ class TouchTipImplementation(
 
         if self._state_view.labware.get_has_quirk(labware_id, "touchTipDisabled"):
             raise TouchTipDisabledError(
-                f"Touch tip not allowed on labware {self._state_view.labware.get_display_name(labware_id)}"
+                f"Touch tip not allowed on labware {labware_id}"
             )
 
         if self._state_view.labware.is_tiprack(labware_id):

opentrons/protocol_engine/commands/unsafe/unsafe_place_labware.py

@@ -14,11 +14,12 @@ from opentrons.protocol_engine.errors.exceptions import (
     CannotPerformGripperAction,
     GripperNotAttachedError,
 )
+from opentrons.types import Point
+
 from ...types import (
     DeckSlotLocation,
     ModuleModel,
     OnDeckLabwareLocation,
-    GripperMoveType,
 )
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors.error_occurrence import ErrorOccurrence
@@ -99,6 +100,22 @@ class UnsafePlaceLabwareImplementation(
             LabwareUri(params.labwareURI)
         )
 
+        # todo(mm, 2024-11-06): This is only correct in the special case of an
+        # absorbance reader lid. Its definition currently puts the offsets for *itself*
+        # in the property that's normally meant for offsets for its *children.*
+        final_offsets = self._state_view.labware.get_child_gripper_offsets(
+            labware_definition=definition, slot_name=None
+        )
+        drop_offset = (
+            Point(
+                final_offsets.dropOffset.x,
+                final_offsets.dropOffset.y,
+                final_offsets.dropOffset.z,
+            )
+            if final_offsets
+            else None
+        )
+
         if isinstance(params.location, DeckSlotLocation):
             self._state_view.addressable_areas.raise_if_area_not_in_deck_configuration(
                 params.location.slotName.id
@@ -122,7 +139,7 @@ class UnsafePlaceLabwareImplementation(
         await ot3api.update_axis_position_estimations([Axis.X, Axis.Y])
 
         # Place the labware down
-        await self._start_movement(ot3api, definition, location)
+        await self._start_movement(ot3api, definition, location, drop_offset)
 
         return SuccessData(public=UnsafePlaceLabwareResult())
 
@@ -131,6 +148,7 @@ class UnsafePlaceLabwareImplementation(
         ot3api: OT3HardwareControlAPI,
         labware_definition: LabwareDefinition,
         location: OnDeckLabwareLocation,
+        drop_offset: Optional[Point],
     ) -> None:
         gripper_homed_position = await ot3api.gantry_position(
             mount=OT3Mount.GRIPPER,
@@ -138,15 +156,13 @@ class UnsafePlaceLabwareImplementation(
         )
 
         to_labware_center = self._state_view.geometry.get_labware_grip_point(
-            labware_definition=labware_definition,
-            location=location,
-            move_type=GripperMoveType.DROP_LABWARE,
-            user_additional_offset=None,
+            labware_definition=labware_definition, location=location
         )
 
         movement_waypoints = get_gripper_labware_placement_waypoints(
             to_labware_center=to_labware_center,
             gripper_home_z=gripper_homed_position.z,
+            drop_offset=drop_offset,
         )
 
         # start movement

opentrons/protocol_engine/errors/__init__.py

@@ -57,7 +57,6 @@ from .exceptions import (
     InvalidTargetSpeedError,
     InvalidTargetTemperatureError,
     InvalidBlockVolumeError,
-    InvalidRampRateError,
     InvalidHoldTimeError,
     InvalidWavelengthError,
     CannotPerformModuleAction,
@@ -91,7 +90,6 @@ from .exceptions import (
     FlexStackerLabwarePoolNotYetDefinedError,
     FlexStackerNotLogicallyEmptyError,
     InvalidLabwarePositionError,
-    InvalidModuleOrientation,
 )
 
 from .error_occurrence import ErrorOccurrence, ProtocolCommandFailedError
@@ -153,7 +151,6 @@ __all__ = [
     "NoTargetTemperatureSetError",
     "InvalidTargetTemperatureError",
     "InvalidTargetSpeedError",
-    "InvalidRampRateError",
     "InvalidBlockVolumeError",
     "InvalidHoldTimeError",
     "InvalidLiquidError",
@@ -177,7 +174,6 @@ __all__ = [
     "FlexStackerLabwarePoolNotYetDefinedError",
     "FlexStackerNotLogicallyEmptyError",
     "InvalidLabwarePositionError",
-    "InvalidModuleOrientation",
     # error occurrence models
     "ErrorOccurrence",
     "CommandNotAllowedError",

opentrons/protocol_engine/errors/exceptions.py

@@ -413,36 +413,6 @@ class WellDoesNotExistError(ProtocolEngineError):
         super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
 
 
-class NoTaskFoundError(ProtocolEngineError):
-    """Raised when referencing a task that does not exist.
-
-    This error could be raised if a protocol references a task before it
-    has been created.
-    """
-
-    def __init__(
-        self,
-        message: Optional[str] = None,
-        details: Optional[Dict[str, Any]] = None,
-        wrapping: Optional[Sequence[EnumeratedError]] = None,
-    ) -> None:
-        """Build a NoTaskFoundError."""
-        super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
-
-
-class TaskFailedError(ProtocolEngineError):
-    """Raised when waiting on a task that failed."""
-
-    def __init__(
-        self,
-        message: Optional[str] = None,
-        details: Optional[Dict[str, Any]] = None,
-        wrapping: Optional[Sequence[EnumeratedError]] = None,
-    ) -> None:
-        """Build a TaskFailedError."""
-        super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
-
-
 class PipetteNotLoadedError(ProtocolEngineError):
     """Raised when referencing a pipette that has not been loaded."""
 
@@ -855,19 +825,6 @@ class InvalidTargetTemperatureError(ProtocolEngineError):
         super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
 
 
-class InvalidRampRateError(ProtocolEngineError):
-    """Raised when attempting to set an invalid ramp rate."""
-
-    def __init__(
-        self,
-        message: Optional[str] = None,
-        details: Optional[Dict[str, Any]] = None,
-        wrapping: Optional[Sequence[EnumeratedError]] = None,
-    ) -> None:
-        """Build a InvalidRampRateError."""
-        super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
-
-
 class InvalidBlockVolumeError(ProtocolEngineError):
     """Raised when attempting to set an invalid block max volume."""
 
@@ -1349,15 +1306,3 @@ class InvalidLabwarePositionError(ProtocolEngineError):
         wrapping: Optional[Sequence[EnumeratedError]] = None,
     ) -> None:
         super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
-
-
-class InvalidModuleOrientation(ProtocolEngineError):
-    """Raised when a module orientation is invalid for a slot id."""
-
-    def __init__(
-        self,
-        message: Optional[str] = None,
-        details: Optional[dict[str, Any]] = None,
-        wrapping: Optional[Sequence[EnumeratedError]] = None,
-    ) -> None:
-        super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)

opentrons/protocol_engine/execution/__init__.py

@@ -21,7 +21,6 @@ from .run_control import RunControlHandler
 from .hardware_stopper import HardwareStopper
 from .door_watcher import DoorWatcher
 from .status_bar import StatusBarHandler
-from .task_handler import TaskHandler
 from ..resources.file_provider import FileProvider
 
 # .thermocycler_movement_flagger omitted from package's public interface.
@@ -47,6 +46,5 @@ __all__ = [
     "DoorWatcher",
     "RailLightsHandler",
     "StatusBarHandler",
-    "TaskHandler",
     "FileProvider",
 ]

opentrons/protocol_engine/execution/command_executor.py

@@ -35,7 +35,6 @@ from .tip_handler import TipHandler
 from .run_control import RunControlHandler
 from .rail_lights import RailLightsHandler
 from .status_bar import StatusBarHandler
-from .task_handler import TaskHandler
 
 
 log = getLogger(__name__)
@@ -86,7 +85,6 @@ class CommandExecutor:
         run_control: RunControlHandler,
         rail_lights: RailLightsHandler,
         status_bar: StatusBarHandler,
-        task_handler: TaskHandler,
         model_utils: Optional[ModelUtils] = None,
         command_note_tracker_provider: Optional[CommandNoteTrackerProvider] = None,
     ) -> None:
@@ -108,7 +106,6 @@ class CommandExecutor:
         self._command_note_tracker_provider = (
             command_note_tracker_provider or _NoteTracker
         )
-        self._task_handler = task_handler
 
     async def execute(self, command_id: str) -> None:
         """Run a given command's execution procedure.
@@ -134,7 +131,6 @@ class CommandExecutor:
             model_utils=self._model_utils,
             status_bar=self._status_bar,
             command_note_adder=note_tracker,
-            task_handler=self._task_handler,
         )
 
         started_at = self._model_utils.get_timestamp()
@@ -218,7 +214,3 @@ class CommandExecutor:
                         type=error_recovery_type,
                     )
                 )
-
-    def cancel_tasks(self, message: str | None = None) -> None:
-        """Cancel all concurrent tasks."""
-        self._task_handler.cancel_all(message=message)

opentrons/protocol_engine/execution/create_queue_worker.py

@@ -17,7 +17,6 @@ from .run_control import RunControlHandler
 from .command_executor import CommandExecutor
 from .queue_worker import QueueWorker
 from .status_bar import StatusBarHandler
-from .task_handler import TaskHandler
 
 
 def create_queue_worker(
@@ -77,9 +76,7 @@ def create_queue_worker(
     rail_lights_handler = RailLightsHandler(
         hardware_api=hardware_api,
     )
-    task_handler = TaskHandler(
-        state_store=state_store, action_dispatcher=action_dispatcher
-    )
+
     status_bar_handler = StatusBarHandler(hardware_api=hardware_api)
 
     command_executor = CommandExecutor(
@@ -96,7 +93,6 @@ def create_queue_worker(
         run_control=run_control_handler,
         rail_lights=rail_lights_handler,
         status_bar=status_bar_handler,
-        task_handler=task_handler,
     )
 
     return QueueWorker(