lint

api/src/opentrons/protocol_engine/state/labware.py

@@ -424,24 +424,26 @@ def get_well_min_height(self, labware_id: str, well_name: str) -> float:
  Returns:
  A single float representing the distance, in millimeters.
  """
- well_definition = self.get_definition(labware_id)
- default_val = 0
- try:
- height_reqs = well_definition.liquidProbeParameters.minimumHeight
- if len(height_reqs) == 0:
- return default_val
- if len(height_reqs) == 1:
- return height_reqs[0].value
- for entry in height_reqs:
- if well_name in entry.applicableWells:
- return entry.value
- if (
- entry.applicableWells == []
- ): # A "custom" default value will have "applicableWells" set to []
- default_val = entry.value
+ labware_definition = self.get_definition(labware_id)
+ default_val = 0.0
+ if (
+ labware_definition.liquidProbeParameters is None
+ or labware_definition.liquidProbeParameters.minimumHeight is None
+ ):
  return default_val
- except AttributeError as e: # will occur when well does not have liquidProbeParameters
+ height_reqs = labware_definition.liquidProbeParameters.minimumHeight
+ if len(height_reqs) == 0:
  return default_val
+ if len(height_reqs) == 1:
+ return float(height_reqs[0]["value"])
+ for entry in height_reqs:
+ if well_name in entry["applicableWells"]:
+ return float(entry["value"])
+ if (
+ entry["applicableWells"] == []
+ ): # A "custom" default value will have "applicableWells" set to []
+ default_val = float(entry["value"])
+ return default_val
 
  def get_well_definition(
  self,