chore(api): apply mypy consistently across api

api/mypy.ini

@@ -3,39 +3,10 @@ plugins = pydantic.mypy, decoy.mypy, numpy.typing.mypy_plugin
 show_error_codes = True
 warn_unused_configs = True
 strict = True
-# TODO(mc, 2021-09-12): work through and remove these exclusions
-exclude = tests/opentrons/(hardware_control/test_(?!(ot3|module_control|modules|thread_manager)).*py|hardware_control/integration/|hardware_control/emulation/|hardware_control/modules/|protocols/advanced_control/|protocols/api_support/|protocols/duration/|protocols/execution/|protocols/fixtures/|protocols/geometry/)
 
 [pydantic-mypy]
 init_forbid_extra = True
 init_typed = True
 warn_required_dynamic_aliases = True
 warn_untyped_fields = True
 
-# TODO(mc, 2021-09-08): fix and remove any / all of the
-# overrides below whenever able
-# ~115 errors
-[mypy-opentrons.protocols.advanced_control.*,opentrons.protocols.api_support.*,opentrons.protocols.duration.*,opentrons.protocols.execution.dev_types,opentrons.protocols.execution.execute_json_v4,opentrons.protocols.execution.execute_python,opentrons.protocols.geometry.*,opentrons.protocols.models.*,opentrons.protocols.labware.*]
-disallow_any_generics = False
-disallow_untyped_defs = False
-disallow_untyped_calls = False
-disallow_incomplete_defs = False
-no_implicit_optional = False
-warn_return_any = False
-
-# ~30 errors
-[mypy-tests.opentrons.drivers.*]
-disallow_untyped_defs = False
-disallow_untyped_calls = False
-disallow_incomplete_defs = False
-
-[mypy-tests.opentrons.protocol_api_old.*]
-disallow_untyped_defs = False
-disallow_untyped_calls = False
-disallow_incomplete_defs = False
-
-# ~10 errors
-[mypy-tests.opentrons.system.*]
-disallow_untyped_defs = False
-disallow_untyped_calls = False
-disallow_incomplete_defs = False

api/src/opentrons/hardware_control/backends/controller.py

@@ -57,20 +57,21 @@ class Controller:
     """
 
     @classmethod
-    async def build(cls, config: RobotConfig) -> Controller:
+    async def build(cls, config: Optional[RobotConfig]) -> Controller:
         """Build a Controller instance.
 
         Use this factory method rather than the initializer to handle proper
         GPIO initialization.
 
         :param config: A loaded robot config.
         """
+
         gpio = build_gpio_chardev("gpiochip0")
         gpio.config_by_board_rev()
         await gpio.setup()
         return cls(config, gpio)
 
-    def __init__(self, config: RobotConfig, gpio: GPIODriverLike):
+    def __init__(self, config: Optional[RobotConfig], gpio: GPIODriverLike):
         """Build a Controller instance.
 
         Always prefer using :py:meth:`.build` to create an instance of this class. For

api/src/opentrons/hardware_control/modules/magdeck.py

@@ -1,6 +1,6 @@
 import asyncio
 import logging
-from typing import Mapping, Optional
+from typing import Dict, Optional
 from opentrons.drivers.mag_deck import (
     SimulatingDriver,
     MagDeckDriver,
@@ -81,7 +81,7 @@ def __init__(
         execution_manager: ExecutionManager,
         hw_control_loop: asyncio.AbstractEventLoop,
         driver: AbstractMagDeckDriver,
-        device_info: Mapping[str, str],
+        device_info: Dict[str, str],
     ) -> None:
         """Constructor"""
         super().__init__(
@@ -162,7 +162,7 @@ def current_height(self) -> float:
         return self._current_height
 
     @property
-    def device_info(self) -> Mapping[str, str]:
+    def device_info(self) -> Dict[str, str]:
         """
 
         Returns: a dict

api/src/opentrons/hardware_control/modules/tempdeck.py

@@ -2,7 +2,7 @@
 
 import asyncio
 import logging
-from typing import Mapping, Optional
+from typing import Dict, Optional
 
 from opentrons.hardware_control.modules.types import TemperatureStatus
 from opentrons.hardware_control.poller import Reader, Poller
@@ -26,7 +26,7 @@
 class TempDeck(mod_abc.AbstractModule):
     """Hardware control interface for an attached Temperature Module."""
 
-    MODULE_TYPE = types.ModuleType.TEMPERATURE
+    MODULE_TYPE = types.ModuleType["TEMPERATURE"]
     FIRST_GEN2_REVISION = 20
 
     @classmethod
@@ -94,7 +94,7 @@ def __init__(
         driver: AbstractTempDeckDriver,
         reader: TempDeckReader,
         poller: Poller,
-        device_info: Mapping[str, str],
+        device_info: Dict[str, str],
         hw_control_loop: asyncio.AbstractEventLoop,
     ) -> None:
         """Constructor"""
@@ -182,7 +182,7 @@ async def deactivate(self, must_be_running: bool = True) -> None:
         await self._reader.read()
 
     @property
-    def device_info(self) -> Mapping[str, str]:
+    def device_info(self) -> Dict[str, str]:
         return self._device_info
 
     @property

api/src/opentrons/protocol_api/instrument_context.py

@@ -39,12 +39,7 @@
 from . import labware, validation
 
 
-AdvancedLiquidHandling = Union[
-    labware.Well,
-    types.Location,
-    Sequence[Union[labware.Well, types.Location]],
-    Sequence[Sequence[labware.Well]],
-]
+AdvancedLiquidHandling = transfers.AdvancedLiquidHandling
 
 _DEFAULT_ASPIRATE_CLEARANCE = 1.0
 _DEFAULT_DISPENSE_CLEARANCE = 1.0

api/src/opentrons/protocols/advanced_control/mix.py

@@ -1,15 +1,13 @@
-import typing
+from typing import Any, Dict, Tuple
 
 from opentrons.protocols.advanced_control.transfers import MixStrategy, Mix
 
 
-def mix_from_kwargs(
-    top_kwargs: typing.Dict[str, typing.Any]
-) -> typing.Tuple[MixStrategy, Mix]:
+def mix_from_kwargs(top_kwargs: Dict[str, Any]) -> Tuple[MixStrategy, Mix]:
     """A utility function to determine mix strategy from key word arguments
     to InstrumentContext.mix"""
 
-    def _mix_requested(kwargs, opt):
+    def _mix_requested(kwargs: Dict[str, Any], opt: str) -> bool:
         """
         Helper for determining mix options from :py:meth:`transfer` kwargs
         Mixes can be ignored in kwargs by either