update abstract methods and take logic out of try/except clause

Author: JonKlar-OT

api/src/opentrons/drivers/thermocycler/driver.py

@@ -210,9 +210,8 @@ async def _get_limit_switch_status(self) -> None:
 
     async def check_lid_status_for_real_this_time(self) -> ThermocyclerLidStatus:
         limit_switch_status = await self._get_limit_switch_status()
-        raise Exception(limit_switch_status)
-        lid_is_closed = utils.parse_key_values(value=limit_switch_status)["C"] == 1
-        lid_is_open = utils.parse_key_values(value=limit_switch_status)["O"] == 1
+        lid_is_closed = utils.parse_key_values(value=limit_switch_status)["C"] == "1"
+        lid_is_open = utils.parse_key_values(value=limit_switch_status)["O"] == "1"
         match (lid_is_closed, lid_is_open):
             case (True, True):
                 return ThermocyclerLidStatus.UNKNOWN

api/src/opentrons/drivers/thermocycler/simulator.py

@@ -56,6 +56,10 @@ async def lift_plate(self) -> None:
     @ensure_yield
     async def get_lid_status(self) -> ThermocyclerLidStatus:
         return self._lid_status
+        
+    @ensure_yield
+    async def check_lid_status_for_real_this_time(self) -> ThermocyclerLidStatus:
+        return self._lid_status
 
     @ensure_yield
     async def get_lid_temperature(self) -> Temperature:

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

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import time
 import asyncio
 import logging
 from typing import Callable, Optional, List, Dict, Mapping, Union, cast
@@ -241,24 +242,13 @@ async def _ensure_lid_closed(self, retry: bool = False) -> None:
         """Ensure the lid is closed after close command"""
         switch_status = await self._driver.check_lid_status_for_real_this_time()
         if switch_status != ThermocyclerLidStatus.CLOSED:
-            if retry:
-                self._retry_close_lid()
+            if not retry:
+                await self.open()
+                await self.close(retry = True)
             else:
-                raise ThermocyclerError(
-                    f"Lid status is {switch_status} after close command, expected CLOSED."
+                raise RuntimeError(
+                    f"Lid status is {switch_status} after close command, expected closed."
                 )
-        
-    async def _retry_close_lid(self) -> None:
-        """Retry closing the lid once if it is not closed after the first close command."""
-        try:
-            await self.open()
-            await self.close(retry = True)
-        except ThermocyclerError as e:
-            log.warning(f"Retrying close lid due to error: {e}")
-            await self._ensure_lid_closed()
-        else:
-            log.info("Lid closed successfully on retry.")
-
 
     async def lift_plate(self) -> str:
         """If the lid is open, lift the plate.