opentrons 8.3.0a1__py2.py3-none-any.whl → 8.3.0a2__py2.py3-none-any.whl

opentrons/protocols/labware.py

@@ -4,7 +4,7 @@ import logging
 import json
 import os
 from pathlib import Path
-from typing import Any, AnyStr, Dict, Optional, Union, List
+from typing import Any, AnyStr, Dict, Optional, Union, List, Sequence, Literal
 
 import jsonschema  # type: ignore
 
@@ -17,10 +17,30 @@ from opentrons.protocols.api_support.constants import (
     USER_DEFS_PATH,
 )
 from opentrons_shared_data.labware.types import LabwareDefinition
+from opentrons_shared_data.errors.exceptions import InvalidProtocolData
 
 
 MODULE_LOG = logging.getLogger(__name__)
 
+LabwareProblem = Literal[
+    "no-schema-id", "bad-schema-id", "schema-mismatch", "invalid-json"
+]
+
+
+class NotALabwareError(InvalidProtocolData):
+    def __init__(
+        self, problem: LabwareProblem, wrapping: Sequence[BaseException]
+    ) -> None:
+        messages: dict[LabwareProblem, str] = {
+            "no-schema-id": "No schema ID present in file",
+            "bad-schema-id": "Bad schema ID in file",
+            "invalid-json": "File does not contain valid JSON",
+            "schema-mismatch": "File does not match labware schema",
+        }
+        super().__init__(
+            message=messages[problem], detail={"kind": problem}, wrapping=wrapping
+        )
+
 
 def get_labware_definition(
     load_name: str,
@@ -126,7 +146,7 @@ def save_definition(
         json.dump(labware_def, f)
 
 
-def verify_definition(
+def verify_definition(  # noqa: C901
     contents: Union[AnyStr, LabwareDefinition, Dict[str, Any]]
 ) -> LabwareDefinition:
     """Verify that an input string is a labware definition and return it.
@@ -146,15 +166,24 @@ def verify_definition(
     if isinstance(contents, dict):
         to_return = contents
     else:
-        to_return = json.loads(contents)
+        try:
+            to_return = json.loads(contents)
+        except json.JSONDecodeError as e:
+            raise NotALabwareError("invalid-json", [e]) from e
     try:
         schema_version = to_return["schemaVersion"]
+    except KeyError as e:
+        raise NotALabwareError("no-schema-id", [e]) from e
+
+    try:
         schema = schemata_by_version[schema_version]
-    except KeyError:
-        raise RuntimeError(
-            f'Invalid or unknown labware schema version {to_return.get("schemaVersion", None)}'
-        )
-    jsonschema.validate(to_return, schema)
+    except KeyError as e:
+        raise NotALabwareError("bad-schema-id", [e]) from e
+
+    try:
+        jsonschema.validate(to_return, schema)
+    except jsonschema.ValidationError as e:
+        raise NotALabwareError("schema-mismatch", [e]) from e
 
     # we can type ignore this because if it passes the jsonschema it has
     # the correct structure

opentrons/util/entrypoint_util.py

@@ -6,7 +6,6 @@ import contextlib
 from dataclasses import dataclass
 import json
 import logging
-from json import JSONDecodeError
 import pathlib
 import subprocess
 import sys
@@ -21,8 +20,6 @@ from typing import (
     TYPE_CHECKING,
 )
 
-from jsonschema import ValidationError  # type: ignore
-
 from opentrons.calibration_storage.deck_configuration import (
     deserialize_deck_configuration,
 )
@@ -32,7 +29,7 @@ from opentrons.config import (
     JUPYTER_NOTEBOOK_LABWARE_DIR,
     SystemArchitecture,
 )
-from opentrons.protocol_api import labware
+from opentrons.protocols import labware
 from opentrons.calibration_storage import helpers
 from opentrons.protocol_engine.errors.error_occurrence import (
     ErrorOccurrence as ProtocolEngineErrorOccurrence,
@@ -79,7 +76,7 @@ def labware_from_paths(
             if child.is_file() and child.suffix.endswith("json"):
                 try:
                     defn = labware.verify_definition(child.read_bytes())
-                except (ValidationError, JSONDecodeError):
+                except labware.NotALabwareError:
                     log.info(f"{child}: invalid labware, ignoring")
                     log.debug(
                         f"{child}: labware invalid because of this exception.",

{opentrons-8.3.0a1.dist-info → opentrons-8.3.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.3.0a1
+Version: 8.3.0a2
 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.3.0a1)
+Requires-Dist: opentrons-shared-data (==8.3.0a2)
 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.3.0a1) ; extra == 'flex-hardware'
+Requires-Dist: opentrons-hardware[flex] (==8.3.0a2) ; extra == 'flex-hardware'
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware (==8.3.0a1) ; extra == 'ot2-hardware'
+Requires-Dist: opentrons-hardware (==8.3.0a2) ; extra == 'ot2-hardware'
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.3.0a1.dist-info → opentrons-8.3.0a2.dist-info}/RECORD

@@ -474,7 +474,7 @@ opentrons/protocol_runner/run_orchestrator.py,sha256=5hGKWPVWcbJkaUCVqPXovmLsZAf
 opentrons/protocol_runner/task_queue.py,sha256=YH8_lvuLBYjfzXAOJU8DYXizQcbaxGmUiAPmd7kHERw,2581
 opentrons/protocols/__init__.py,sha256=cOUxilkIvdlqGvN4nYJQYr0TGdIWnzxBaTfoz3svmw8,245
 opentrons/protocols/bundle.py,sha256=QW_2kwnxgdG_nNPl2e110A5ehOH9Ej63-9TBx-F9Yvw,3666
-opentrons/protocols/labware.py,sha256=e3r3fk3Vs7pl61qk-ZR90s4D3h_gu8Pv3aL_-7V082w,9759
+opentrons/protocols/labware.py,sha256=UvFDDz64-WgHXqEg6xSXi1q0R6A2-HFUhcFrAS6Snn8,10809
 opentrons/protocols/parse.py,sha256=viQxA4NiERPmZeHQaujq1CheiUop2oWkoPC8p7V_XqQ,27488
 opentrons/protocols/types.py,sha256=XttBJsVGx5hd__PK7OJzMepdlcRaQmno3-yZ0hUJNME,6045
 opentrons/protocols/advanced_control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -533,15 +533,15 @@ opentrons/util/__init__.py,sha256=0ytBXWZoU15mtAqAwq-fKLgUrc-eMWXoNd2bCVtjNHE,87
 opentrons/util/async_helpers.py,sha256=v88i4JO4HGYNrIw1EkOhgJtrkMMNPBDsoweqZct8PPw,6155
 opentrons/util/broker.py,sha256=lFtIWvp44bSWWrp7pydLHLr7nRNnl5jmLvfkXzKfa5s,2705
 opentrons/util/change_notifier.py,sha256=Rmo0cyVV3yTNz62JdUHlVpiPbIj1HC6mlRUh0SXFai8,1628
-opentrons/util/entrypoint_util.py,sha256=5z9HjwvTfaWzvM4PcDVnvJfzB_UkNHfhQ0Ly3AQEurQ,10889
+opentrons/util/entrypoint_util.py,sha256=C0KN-09_WgNkqLbCyIB3yVm-kJoe7RGrZTb7qh9z0ec,10787
 opentrons/util/get_union_elements.py,sha256=H1KqLnG1zYvI2kanhc3MXRZT-S07E5a2vF1jEkhXpCs,1073
 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.3.0a1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-opentrons-8.3.0a1.dist-info/METADATA,sha256=sSOSsL481AAlRXiXEbVvwQkf4iHo1mgg-DSPxO7jzKM,5084
-opentrons-8.3.0a1.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
-opentrons-8.3.0a1.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
-opentrons-8.3.0a1.dist-info/top_level.txt,sha256=wk6whpbMZdBQpcK0Fg0YVfUGrAgVOFON7oQAhOMGMW8,10
-opentrons-8.3.0a1.dist-info/RECORD,,
+opentrons-8.3.0a2.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+opentrons-8.3.0a2.dist-info/METADATA,sha256=N6FK95vBL2iTWYoENZJ4mqas-qArDOGOhgq1ZLpbPFk,5084
+opentrons-8.3.0a2.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+opentrons-8.3.0a2.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
+opentrons-8.3.0a2.dist-info/top_level.txt,sha256=wk6whpbMZdBQpcK0Fg0YVfUGrAgVOFON7oQAhOMGMW8,10
+opentrons-8.3.0a2.dist-info/RECORD,,