fix some types

Author: CamDavidsonPilon

pioreactor/actions/od_calibration.py

@@ -39,7 +39,6 @@
 from pioreactor.whoami import is_testing_env
 
 
-
 def green(string):
     return style(string, fg="green")
 
@@ -102,12 +101,14 @@ def get_metadata_from_user() -> tuple[pt.OD600, pt.OD600, pt.mL, pt.PdAngle, pt.
     )
 
     while minimum_od600 >= initial_od600:
-        minimum_od600 = prompt(
-            "The minimum OD600 measurement must be less than the initial OD600 culture measurement",
-            type=click.FloatRange(min=0, max=initial_od600, clamp=False),
+        minimum_od600 = cast(
+            pt.OD600,
+            prompt(
+                "The minimum OD600 measurement must be less than the initial OD600 culture measurement",
+                type=click.FloatRange(min=0, max=initial_od600, clamp=False),
+            ),
         )
 
-    assert isinstance(minimum_od600, )
     if minimum_od600 == 0:
         minimum_od600 = 0.01
 
@@ -130,8 +131,7 @@ def get_metadata_from_user() -> tuple[pt.OD600, pt.OD600, pt.mL, pt.PdAngle, pt.
         # technically it's not required? we just need a specific PD channel to calibrate from.
 
     ref_channel = config["od_config.photodiode_channel_reverse"]["REF"]
-    signal_channel = "1" if ref_channel == "2" else "2"
-    #assert isinstance(signal_channel, pt.PdChannel)
+    signal_channel = cast(pt.PdChannel, "1" if ref_channel == "2" else "2")
 
     confirm(
         green(
@@ -140,8 +140,7 @@ def get_metadata_from_user() -> tuple[pt.OD600, pt.OD600, pt.mL, pt.PdAngle, pt.
         abort=True,
         default=True,
     )
-    angle = config["od_config.photodiode_channel"][signal_channel]
-    #assert isinstance(angle, pt.PdAngle)
+    angle = cast(pt.PdAngle, config["od_config.photodiode_channel"][signal_channel])
     return initial_od600, minimum_od600, dilution_amount, angle, signal_channel
 
 
@@ -460,7 +459,7 @@ def save_results(
     return data_blob
 
 
-def get_data_from_data_file(data_file: str) -> tuple[str, str, list[float], list[float]]:
+def get_data_from_data_file(data_file: str) -> tuple[pt.PdChannel, pt.PdAngle, list[float], list[float]]:
     import json
 
     click.echo(f"Pulling data from {data_file}...")

pioreactor/pubsub.py

@@ -11,7 +11,6 @@
 from typing import Optional
 
 from paho.mqtt.client import Client as PahoClient
-from paho.mqtt.client import ssl
 
 from pioreactor.config import config
 from pioreactor.config import mqtt_address
@@ -108,6 +107,8 @@ def default_on_connect(client: Client, userdata, flags, rc: int, properties=None
         config.get("mqtt", "password", fallback="raspberry"),
     )
     if tls:
+        import ssl
+
         client.tls_set(tls_version=ssl.PROTOCOL_TLS)
 
     if on_connect:
@@ -166,8 +167,8 @@ def publish(topic: str, message, retries: int = 3, **mqtt_kwargs) -> None:
 
     else:
         logger = create_logger("pubsub.publish", to_mqtt=False)
-        logger.error(f"Unable to connect to MQTT.")
-        raise ConnectionRefusedError(f"Unable to connect to MQTT.")
+        logger.error("Unable to connect to MQTT.")
+        raise ConnectionRefusedError("Unable to connect to MQTT.")
 
 
 def subscribe(