opentrons 8.4.0a0__py2.py3-none-any.whl → 8.4.0a1__py2.py3-none-any.whl

opentrons/hardware_control/backends/subsystem_manager.py

@@ -58,7 +58,7 @@ class SubsystemManager:
     _expected_core_targets: Set[FirmwareTarget]
     _present_tools: tools.types.ToolSummary
     _tool_task_condition: asyncio.Condition
-    _tool_task_state: Union[bool, Exception]
+    _tool_task_state: Union[bool, BaseException]
     _updates_required: Dict[FirmwareTarget, FirmwareUpdateRequirements]
     _updates_ongoing: Dict[SubSystem, UpdateStatus]
     _update_bag: FirmwareUpdate
@@ -370,7 +370,8 @@ class SubsystemManager:
     async def _tool_detection_task_main(self) -> None:
         try:
             await self._tool_detection_task_protected()
-        except Exception as e:
+        except BaseException as e:
+            log.exception("Tool reader task failed")
             async with self._tool_task_condition:
                 self._tool_task_state = e
                 self._tool_task_condition.notify_all()
@@ -414,9 +415,7 @@ class SubsystemManager:
             )
             self._present_tools = await self._tool_detector.resolve(to_resolve, 10.0)
             log.info(f"Present tools are now {self._present_tools}")
-            await network.log_motor_usage_data(
-                self._can_messenger, list(set(base_can_nodes + [t for t in tool_nodes]))
-            )
+            await network.log_motor_usage_data(self._can_messenger)
             async with self._tool_task_condition:
                 self._tool_task_state = True
                 self._tool_task_condition.notify_all()

opentrons/protocol_api/instrument_context.py

@@ -778,6 +778,7 @@ class InstrumentContext(publisher.CommandPublisher):
         target = loc.labware.as_well().top(height)
         self.move_to(target, publish=False)
         if self.api_version >= _AIR_GAP_TRACKING_ADDED_IN:
+            self._core.prepare_to_aspirate()
             c_vol = self._core.get_available_volume() if volume is None else volume
             flow_rate = self._core.get_aspirate_flow_rate()
             self._core.air_gap_in_place(c_vol, flow_rate)

opentrons/protocol_engine/commands/evotip_seal_pipette.py

@@ -40,9 +40,12 @@ if TYPE_CHECKING:
 
 
 EvotipSealPipetteCommandType = Literal["evotipSealPipette"]
-_PREP_DISTANCE_DEFAULT = 8.25
-_PRESS_DISTANCE_DEFAULT = 3.5
-_EJECTOR_PUSH_MM_DEFAULT = 7.0
+_CAM_PREP_DISTANCE_DEFAULT = 8.25
+_CAM_PRESS_DISTANCE_DEFAULT = 3.5
+_CAM_EJECTOR_PUSH_MM_DEFAULT = 7.0
+_PRESS_FIT_PREP_DISTANCE_DEFAULT = 0
+_PRESS_FIT_PRESS_DISTANCE_DEFAULT = -11.0
+_PRESS_FIT_EJECTOR_PUSH_MM_DEFAULT = 0
 _SAFE_TOP_VOLUME = 1000
 
 
@@ -244,29 +247,28 @@ class EvotipSealPipetteImplementation(
         channels = self._state_view.tips.get_pipette_active_channels(pipette_id)
         mount = self._state_view.pipettes.get_mount(pipette_id)
         tip_pick_up_params = params.tipPickUpParams
-        if tip_pick_up_params is None:
-            tip_pick_up_params = TipPickUpParams(
-                prepDistance=_PREP_DISTANCE_DEFAULT,
-                pressDistance=_PRESS_DISTANCE_DEFAULT,
-                ejectorPushMm=_EJECTOR_PUSH_MM_DEFAULT,
-            )
 
-        if channels != 96:
-            await self.relative_pickup_tip(
-                tip_pick_up_params=tip_pick_up_params,
-                mount=mount,
-            )
-        elif channels == 96:
+        if channels == 96:
+            if tip_pick_up_params is None:
+                tip_pick_up_params = TipPickUpParams(
+                    prepDistance=_CAM_PREP_DISTANCE_DEFAULT,
+                    pressDistance=_CAM_PRESS_DISTANCE_DEFAULT,
+                    ejectorPushMm=_CAM_EJECTOR_PUSH_MM_DEFAULT,
+                )
             await self.cam_action_relative_pickup_tip(
                 tip_pick_up_params=tip_pick_up_params,
                 mount=mount,
             )
         else:
-            tip_geometry = await self._tip_handler.pick_up_tip(
-                pipette_id=pipette_id,
-                labware_id=labware_id,
-                well_name=well_name,
-                do_not_ignore_tip_presence=True,
+            if tip_pick_up_params is None:
+                tip_pick_up_params = TipPickUpParams(
+                    prepDistance=_PRESS_FIT_PREP_DISTANCE_DEFAULT,
+                    pressDistance=_PRESS_FIT_PRESS_DISTANCE_DEFAULT,
+                    ejectorPushMm=_PRESS_FIT_EJECTOR_PUSH_MM_DEFAULT,
+                )
+            await self.relative_pickup_tip(
+                tip_pick_up_params=tip_pick_up_params,
+                mount=mount,
             )
 
         # cache_tip

opentrons/protocol_engine/commands/prepare_to_aspirate.py

@@ -5,7 +5,11 @@ from pydantic import BaseModel
 from typing import TYPE_CHECKING, Optional, Type, Union
 from typing_extensions import Literal
 
-from .pipetting_common import OverpressureError, PipetteIdMixin, prepare_for_aspirate
+from .pipetting_common import (
+    OverpressureError,
+    PipetteIdMixin,
+    prepare_for_aspirate,
+)
 from .command import (
     AbstractCommandImpl,
     BaseCommand,
@@ -66,6 +70,14 @@ class PrepareToAspirateImplementation(
 
     async def execute(self, params: PrepareToAspirateParams) -> _ExecuteReturn:
         """Prepare the pipette to aspirate."""
+        ready_to_aspirate = self._pipetting_handler.get_is_ready_to_aspirate(
+            pipette_id=params.pipetteId
+        )
+        if ready_to_aspirate:
+            return SuccessData(
+                public=PrepareToAspirateResult(),
+            )
+
         current_position = await self._gantry_mover.get_position(params.pipetteId)
         prepare_result = await prepare_for_aspirate(
             pipette_id=params.pipetteId,
@@ -79,6 +91,7 @@ class PrepareToAspirateImplementation(
                 )
             },
         )
+
         if isinstance(prepare_result, DefinedErrorData):
             return prepare_result
         else:

opentrons/protocol_engine/commands/unsafe/unsafe_drop_tip_in_place.py

@@ -78,7 +78,12 @@ class UnsafeDropTipInPlaceImplementation(
             [Axis.of_main_tool_actuator(pipette_location.mount.to_hw_mount())]
         )
         await self._tip_handler.drop_tip(
-            pipette_id=params.pipetteId, home_after=params.homeAfter
+            pipette_id=params.pipetteId,
+            home_after=params.homeAfter,
+            ignore_plunger=(
+                self._state_view.tips.get_pipette_active_channels(params.pipetteId)
+                == 96
+            ),
         )
 
         state_update = StateUpdate()

{opentrons-8.4.0a0.dist-info → opentrons-8.4.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.4.0a0
+Version: 8.4.0a1
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Author: Opentrons
 Author-email: engineering@opentrons.com
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 License-File: ../LICENSE
-Requires-Dist: opentrons-shared-data (==8.4.0a0)
+Requires-Dist: opentrons-shared-data (==8.4.0a1)
 Requires-Dist: aionotify (==0.3.1)
 Requires-Dist: anyio (<4.0.0,>=3.6.1)
 Requires-Dist: jsonschema (<4.18.0,>=3.0.1)
@@ -35,9 +35,9 @@ Requires-Dist: pyusb (==1.2.1)
 Requires-Dist: packaging (>=21.0)
 Requires-Dist: importlib-metadata (>=1.0) ; python_version < "3.8"
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[flex] (==8.4.0a0) ; extra == 'flex-hardware'
+Requires-Dist: opentrons-hardware[flex] (==8.4.0a1) ; extra == 'flex-hardware'
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware (==8.4.0a0) ; extra == 'ot2-hardware'
+Requires-Dist: opentrons-hardware (==8.4.0a1) ; extra == 'ot2-hardware'
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.4.0a0.dist-info → opentrons-8.4.0a1.dist-info}/RECORD

@@ -124,7 +124,7 @@ opentrons/hardware_control/backends/ot3simulator.py,sha256=rmEKUtwwQV6Der-gqOWcf
 opentrons/hardware_control/backends/ot3utils.py,sha256=VYpyvaE3M9CzhgLL4ObgcXP3gmSGyaOyiRVqcbudCn0,23087
 opentrons/hardware_control/backends/simulator.py,sha256=q_9PQlBdOyCa9sj2gLqYWZ-fG9v4mddDAiScL-yHCXY,17549
 opentrons/hardware_control/backends/status_bar_state.py,sha256=ftNn2ouBhPZiFbUm79I4z6ndup7XDmcNowhb-KREspE,8529
-opentrons/hardware_control/backends/subsystem_manager.py,sha256=3rey8TPuA1eOcO11zjlhRVGHZK7dEOADu8kHzyDgJYI,16707
+opentrons/hardware_control/backends/subsystem_manager.py,sha256=_bcVUdb5R8UB_x_n1BPyz5OsfkyyaMLYxotvo3fIoh0,16685
 opentrons/hardware_control/backends/tip_presence_manager.py,sha256=wzK8bvcr4lcCOwIwAz8ParXtXfrbt5hod7-stTP0ts0,5973
 opentrons/hardware_control/backends/types.py,sha256=Fo7qTDyYfKW-NhcymqLQfkPBWOm6GO89q3JUqNnLIUo,329
 opentrons/hardware_control/emulation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -228,7 +228,7 @@ opentrons/protocol_api/config.py,sha256=r9lyvXjagTX_g3q5FGURPpcz2IA9sSF7Oa_1mKx-
 opentrons/protocol_api/create_protocol_context.py,sha256=wwsZje0L__oDnu1Yrihau320_f-ASloR9eL1QCtkOh8,7612
 opentrons/protocol_api/deck.py,sha256=94vFceg1SC1bAGd7TvC1ZpYwnJR-VlzurEZ6jkacYeg,8910
 opentrons/protocol_api/disposal_locations.py,sha256=NRiSGmDR0LnbyEkWSOM-o64uR2fUoB1NWJG7Y7SsJSs,7920
-opentrons/protocol_api/instrument_context.py,sha256=O0DWbYvkn6EIQu2A7xue2CbhcWZsGBbyVYt2JjMyS5g,111728
+opentrons/protocol_api/instrument_context.py,sha256=ZR8GZF35-hUEGYTUkWm55v4KvI775t1Nfrl1g4pgu00,111773
 opentrons/protocol_api/labware.py,sha256=q980jPZuBwvgwzIdBRyGn7bsJKiEPoAxO7y3iGPoczk,61406
 opentrons/protocol_api/module_contexts.py,sha256=3tVXj6Q7n-WuTJPU_dvIQLzzGv1P-jsMuDtMVpuhAf8,48291
 opentrons/protocol_api/module_validation_and_errors.py,sha256=XL_m72P8rcvGO2fynY7UzXLcpGuI6X4s0V6Xf735Iyc,1464
@@ -309,7 +309,7 @@ opentrons/protocol_engine/commands/dispense_while_tracking.py,sha256=VCLWwlAbaTr
 opentrons/protocol_engine/commands/drop_tip.py,sha256=ZZ63IoiT4dgWcemAHhNQfV4DUhkl-ToJyTRTxIiyAkc,7895
 opentrons/protocol_engine/commands/drop_tip_in_place.py,sha256=gwSNEKBwds7kOTucXKSK74ozrDe7Cqhta7NR6IqKV3g,7062
 opentrons/protocol_engine/commands/evotip_dispense.py,sha256=5OPrBmLMne1HiUzfkHJN5joZxiJAbkeZxbEsGPTtfVI,4636
-opentrons/protocol_engine/commands/evotip_seal_pipette.py,sha256=5r2ma1-0MJ4YYLDG7TAfhfhw5sZPMcfPwsrPPAJxZAs,11023
+opentrons/protocol_engine/commands/evotip_seal_pipette.py,sha256=Xo5sYVd1zuvrKLyGbmZuhQNvpNBSDNlUNgjYCxs9R_8,11239
 opentrons/protocol_engine/commands/evotip_unseal_pipette.py,sha256=RXCo2opcKrFiR97hISNXfPGrHGj0eiPHwAZJMi0jY9w,4888
 opentrons/protocol_engine/commands/generate_command_schema.py,sha256=21Al_XQyRMNTb2ssVaxcNSPlgreOsCtKVXf8kZgpvR4,2296
 opentrons/protocol_engine/commands/get_next_tip.py,sha256=JS5hN_UScAiUIo_j7KT2cR1GDj3hDvaNPTSovWbgTHo,4828
@@ -334,7 +334,7 @@ opentrons/protocol_engine/commands/move_to_well.py,sha256=fM8m5IcLjYZXy5fNjH_As4
 opentrons/protocol_engine/commands/movement_common.py,sha256=bnJuwcp6nkyoxkTXqfSXnnKgZ7TKflkMGZSHXuPWsRk,11950
 opentrons/protocol_engine/commands/pick_up_tip.py,sha256=pa2PXDvPyh5ZIYQeu_9XUnybE9CQ6VXooDO07gXCS5U,7726
 opentrons/protocol_engine/commands/pipetting_common.py,sha256=Rok3Fy3jwJj_irXVRnUSjzpRpKVzVbYCv7odRQAYWEY,15222
-opentrons/protocol_engine/commands/prepare_to_aspirate.py,sha256=v7fZeDPSPJOkF0bIDu_zQ8W5FlToKHpqCqtb774jBb8,3503
+opentrons/protocol_engine/commands/prepare_to_aspirate.py,sha256=0Xh0E0OEE2730zR-hhmp4y__MMKyJLZ0S8I68BTH83g,3776
 opentrons/protocol_engine/commands/reload_labware.py,sha256=eB1X7M9rHso1qc0beBTVHm5SHbjS6IODsIDj9RhR3mI,2910
 opentrons/protocol_engine/commands/retract_axis.py,sha256=3h0eb6O3fjrCBY89q9tnjDFUGQXN9qafURxvXGcmCm4,2889
 opentrons/protocol_engine/commands/save_position.py,sha256=koxPh6t8s7Cl1vjPt9e6raZz5_rQtXsg_IGdWqAPzPI,3395
@@ -399,7 +399,7 @@ opentrons/protocol_engine/commands/thermocycler/wait_for_block_temperature.py,sh
 opentrons/protocol_engine/commands/thermocycler/wait_for_lid_temperature.py,sha256=KZHt1dUWPrWUk_d0hl0TiAQhfaVdc_YZcxyMcZ0FLq8,2971
 opentrons/protocol_engine/commands/unsafe/__init__.py,sha256=lx3TFW_78XK0bdtLFuGXrvUGaeYrSFj5pHucEL-IYHI,2499
 opentrons/protocol_engine/commands/unsafe/unsafe_blow_out_in_place.py,sha256=uK9240g-lx0JE1N1f6Nfj_crhf9olHmzcxbUk6sMZoU,3374
-opentrons/protocol_engine/commands/unsafe/unsafe_drop_tip_in_place.py,sha256=F-JEMbZYpSPPIT41SIXDUj_9eiVNtp91_yRZDdT7az0,3898
+opentrons/protocol_engine/commands/unsafe/unsafe_drop_tip_in_place.py,sha256=BHBK14fC4P9B3IWILj-qWfK8QFdfntnJAwP1eRkThnM,4061
 opentrons/protocol_engine/commands/unsafe/unsafe_engage_axes.py,sha256=Ze5hLslsXdd7l3lF0GKOPoWCdTmqTTGIjiTQyNhL-W4,2502
 opentrons/protocol_engine/commands/unsafe/unsafe_place_labware.py,sha256=mcIPhcQvVCUL_wfb2-JPrCvIFTXMVD93VeJb4H1LmhM,7873
 opentrons/protocol_engine/commands/unsafe/unsafe_ungrip_labware.py,sha256=9Sjx92JZhi-tRY1P77M--jJp4JzIGESXUakIpstESwQ,2461
@@ -582,9 +582,9 @@ opentrons/util/helpers.py,sha256=3hr801bWGbxEcOFAS7f-iOhmnUhoK5qahbB8SIvaCfY,165
 opentrons/util/linal.py,sha256=IlKAP9HkNBBgULeSf4YVwSKHdx9jnCjSr7nvDvlRALg,5753
 opentrons/util/logging_config.py,sha256=UHoY7dyD6WMYNP5GKowbMxUSG_hlXeI5TaIwksR5u-U,6887
 opentrons/util/performance_helpers.py,sha256=ew7H8XD20iS6-2TJAzbQeyzStZkkE6PzHt_Adx3wbZQ,5172
-opentrons-8.4.0a0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-opentrons-8.4.0a0.dist-info/METADATA,sha256=QdfN1bVLFyxPJTRVEmzU6uQwWYGil9Fi8zqlsuAwkXc,5084
-opentrons-8.4.0a0.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
-opentrons-8.4.0a0.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
-opentrons-8.4.0a0.dist-info/top_level.txt,sha256=wk6whpbMZdBQpcK0Fg0YVfUGrAgVOFON7oQAhOMGMW8,10
-opentrons-8.4.0a0.dist-info/RECORD,,
+opentrons-8.4.0a1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+opentrons-8.4.0a1.dist-info/METADATA,sha256=8YWOEy1zF1c1FIsrnmCpPbvRXCcCjdbfXdWDGgtFsfM,5084
+opentrons-8.4.0a1.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+opentrons-8.4.0a1.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
+opentrons-8.4.0a1.dist-info/top_level.txt,sha256=wk6whpbMZdBQpcK0Fg0YVfUGrAgVOFON7oQAhOMGMW8,10
+opentrons-8.4.0a1.dist-info/RECORD,,