opentrons 8.1.0a0__py2.py3-none-any.whl → 8.2.0__py2.py3-none-any.whl

opentrons/types.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import enum
 from math import sqrt, isclose
-from typing import TYPE_CHECKING, Any, NamedTuple, Iterator, Union, List
+from typing import TYPE_CHECKING, Any, NamedTuple, Iterator, Union, List, Optional
 
 from opentrons_shared_data.robot.types import RobotType
 
@@ -79,7 +79,9 @@ LocationLabware = Union[
 
 
 class Location:
-    """A location to target as a motion.
+    """Location(point: Point, labware: Union["Labware", "Well", str, "ModuleGeometry", LabwareLike, None, "ModuleContext"])
+
+    A location to target as a motion.
 
     The location contains a :py:class:`.Point` (in
     :ref:`protocol-api-deck-coords`) and possibly an associated
@@ -116,10 +118,13 @@ class Location:
             None,
             "ModuleContext",
         ],
+        *,
+        _ot_internal_is_meniscus: Optional[bool] = None,
     ):
         self._point = point
         self._given_labware = labware
         self._labware = LabwareLike(labware)
+        self._is_meniscus = _ot_internal_is_meniscus
 
     # todo(mm, 2021-10-01): Figure out how to get .point and .labware to show up
     # in the rendered docs, and then update the class docstring to use cross-references.
@@ -132,6 +137,10 @@ class Location:
     def labware(self) -> LabwareLike:
         return self._labware
 
+    @property
+    def is_meniscus(self) -> Optional[bool]:
+        return self._is_meniscus
+
     def __iter__(self) -> Iterator[Union[Point, LabwareLike]]:
         """Iterable interface to support unpacking. Like a tuple.
 
@@ -148,6 +157,7 @@ class Location:
             isinstance(other, Location)
             and other._point == self._point
             and other._labware == self._labware
+            and other._is_meniscus == self._is_meniscus
         )
 
     def move(self, point: Point) -> "Location":
@@ -173,7 +183,7 @@ class Location:
         return Location(point=self.point + point, labware=self._given_labware)
 
     def __repr__(self) -> str:
-        return f"Location(point={repr(self._point)}, labware={self._labware})"
+        return f"Location(point={repr(self._point)}, labware={self._labware}, is_meniscus={self._is_meniscus if self._is_meniscus is not None else False})"
 
 
 # TODO(mc, 2020-10-22): use MountType implementation for Mount
@@ -282,6 +292,23 @@ class DeckSlotName(enum.Enum):
         str_val = str(value).upper()
         return cls(str_val)
 
+    @classmethod
+    def ot3_slots(cls) -> List["DeckSlotName"]:
+        return [
+            DeckSlotName.SLOT_A1,
+            DeckSlotName.SLOT_A2,
+            DeckSlotName.SLOT_A3,
+            DeckSlotName.SLOT_B1,
+            DeckSlotName.SLOT_B2,
+            DeckSlotName.SLOT_B3,
+            DeckSlotName.SLOT_C1,
+            DeckSlotName.SLOT_C2,
+            DeckSlotName.SLOT_C3,
+            DeckSlotName.SLOT_D1,
+            DeckSlotName.SLOT_D2,
+            DeckSlotName.SLOT_D3,
+        ]
+
     # TODO(mm, 2023-05-08):
     # Migrate callers off of this method. https://opentrons.atlassian.net/browse/RLAB-345
     def as_int(self) -> int:

opentrons/util/logging_config.py

@@ -5,10 +5,17 @@ from typing import Any, Dict
 
 from opentrons.config import CONFIG, ARCHITECTURE, SystemArchitecture
 
+if ARCHITECTURE is SystemArchitecture.YOCTO:
+    from opentrons_hardware.sensors import SENSOR_LOG_NAME
+else:
+    # we don't use the sensor log on ot2 or host
+    SENSOR_LOG_NAME = "unused"
+
 
 def _host_config(level_value: int) -> Dict[str, Any]:
     serial_log_filename = CONFIG["serial_log_file"]
     api_log_filename = CONFIG["api_log_file"]
+    sensor_log_filename = CONFIG["sensor_log_file"]
     return {
         "version": 1,
         "disable_existing_loggers": False,
@@ -41,6 +48,14 @@ def _host_config(level_value: int) -> Dict[str, Any]:
                 "level": logging.DEBUG,
                 "backupCount": 5,
             },
+            "sensor": {
+                "class": "logging.handlers.RotatingFileHandler",
+                "formatter": "basic",
+                "filename": sensor_log_filename,
+                "maxBytes": 1000000,
+                "level": logging.DEBUG,
+                "backupCount": 5,
+            },
         },
         "loggers": {
             "opentrons": {
@@ -66,6 +81,11 @@ def _host_config(level_value: int) -> Dict[str, Any]:
                 "level": logging.DEBUG,
                 "propagate": False,
             },
+            SENSOR_LOG_NAME: {
+                "handlers": ["sensor"],
+                "level": logging.DEBUG,
+                "propagate": False,
+            },
             "__main__": {"handlers": ["api"], "level": level_value},
         },
     }
@@ -75,6 +95,7 @@ def _buildroot_config(level_value: int) -> Dict[str, Any]:
     # Import systemd.journald here since it is generally unavailble on non
     # linux systems and we probably don't want to use it on linux desktops
     # either
+    sensor_log_filename = CONFIG["sensor_log_file"]
     return {
         "version": 1,
         "disable_existing_loggers": False,
@@ -106,6 +127,14 @@ def _buildroot_config(level_value: int) -> Dict[str, Any]:
                 "formatter": "message_only",
                 "SYSLOG_IDENTIFIER": "opentrons-api-serial-usbbin",
             },
+            "sensor": {
+                "class": "logging.handlers.RotatingFileHandler",
+                "formatter": "message_only",
+                "filename": sensor_log_filename,
+                "maxBytes": 1000000,
+                "level": logging.DEBUG,
+                "backupCount": 3,
+            },
         },
         "loggers": {
             "opentrons.drivers.asyncio.communication.serial_connection": {
@@ -131,6 +160,11 @@ def _buildroot_config(level_value: int) -> Dict[str, Any]:
                 "level": logging.DEBUG,
                 "propagate": False,
             },
+            SENSOR_LOG_NAME: {
+                "handlers": ["sensor"],
+                "level": logging.DEBUG,
+                "propagate": False,
+            },
             "__main__": {"handlers": ["api"], "level": level_value},
         },
     }

{opentrons-8.1.0a0.dist-info → opentrons-8.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.1.0a0
+Version: 8.2.0
 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.1.0a0
+Requires-Dist: opentrons-shared-data ==8.2.0
 Requires-Dist: aionotify ==0.3.1
 Requires-Dist: anyio <4.0.0,>=3.6.1
 Requires-Dist: jsonschema <4.18.0,>=3.0.1
@@ -30,12 +30,13 @@ Requires-Dist: pydantic <2.0.0,>=1.10.9
 Requires-Dist: pyserial >=3.5
 Requires-Dist: typing-extensions <5,>=4.0.0
 Requires-Dist: click <9,>=8.0.0
+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.1.0a0 ; extra == 'flex-hardware'
+Requires-Dist: opentrons-hardware[flex] ==8.2.0 ; extra == 'flex-hardware'
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware ==8.1.0a0 ; extra == 'ot2-hardware'
+Requires-Dist: opentrons-hardware ==8.2.0 ; extra == 'ot2-hardware'
 
 .. _Full API Documentation: http://docs.opentrons.com