v0.5.6

setup.py

@@ -43,7 +43,6 @@ def readme():
         "typer==0.4.1",
         "tqdm==4.63.0",
         "transitions==0.8.11",
-        "pyngrok==7.0.3",
         "numba==0.56.0",
         "Jinja2==3.1.3",
         "xhtml2pdf==0.2.11",

ulc_mm_package/QtGUI/dev_run.py

@@ -49,9 +49,6 @@
 
 from ulc_mm_package.image_processing.processing_constants import FLOWRATE
 
-from ulc_mm_package.utilities.ngrok_utils import make_tcp_tunnel, NgrokError
-from ulc_mm_package.utilities.email_utils import send_ngrok_email
-
 from ulc_mm_package.neural_nets.AutofocusInference import AutoFocus
 import ulc_mm_package.neural_nets.neural_network_constants as nn_constants
 
@@ -636,13 +633,6 @@ def __init__(self, *args, **kwargs):
         # Misc
         self.fan.turn_on_all()
         self.btnExit.clicked.connect(self.exit)
-        try:
-            ngrok_address = make_tcp_tunnel()
-            send_ngrok_email()
-        except NgrokError as e:
-            print(f"Ngrok error : {e}")
-            ngrok_address = "-ngrok error-"
-        self.lblngrok.setText(f"{ngrok_address}")
 
         # Set slider min/max
         self.min_exposure_us = 100

ulc_mm_package/QtGUI/oracle.py

@@ -1,4 +1,4 @@
-""" High-level state machine manager.
+"""High-level state machine manager.
 
 The Oracle sees all and knows all.
 It owns all GUI windows, threads, and worker objects (ScopeOp and Acquisition).
@@ -70,8 +70,6 @@
     AUTOFOCUS_MODEL_DIR,
     YOGO_MODEL_DIR,
 )
-from ulc_mm_package.utilities.email_utils import send_ngrok_email, EmailError
-from ulc_mm_package.utilities.ngrok_utils import make_tcp_tunnel, NgrokError
 
 from ulc_mm_package.QtGUI.scope_op import ScopeOp
 from ulc_mm_package.QtGUI.form_gui import FormGUI
@@ -159,24 +157,7 @@ def __init__(self):
         self.next_state()
 
     def _init_tcp(self):
-        try:
-            tcp_addr = make_tcp_tunnel()
-            self.logger.info(f"SSH address is {tcp_addr}.")
-            self.liveview_window.update_tcp(tcp_addr)
-            send_ngrok_email()
-        except NgrokError as e:
-            self.logger.warning(
-                f"SSH address could not be found - {e}. This can be safely ignored."
-            )
-            self.liveview_window.update_tcp("unavailable")
-        except EmailError as e:
-            self.logger.warning(
-                f"SSH address could not be emailed - {e}. This can be safely ignored."
-            )
-        except Exception as e:
-            self.logger.warning(
-                f"Unexpected error while setting up TCP: {e}. This can be safely ignored."
-            )
+        self.liveview_window.update_tcp("unavailable")
 
     def _check_lock(self):
         if path.isfile(LOCKFILE):

ulc_mm_package/hardware/scope_routines.py

@@ -386,6 +386,7 @@ def periodic_autobrightness_routine(
             if counter >= processing_constants.PERIODIC_AB_PERIOD_NUM_FRAMES:
                 autobrightness.autobrightness_pid_control(img)
                 curr_img_brightness = autobrightness.prev_mean_img_brightness
+                counter = 0
 
     def checkPressureDifference(
         self, mscope: MalariaScope, ambient_pressure: float

ulc_mm_package/scope_constants.py

@@ -200,10 +200,6 @@ def IMG_HEIGHT(self) -> int:
 if VERBOSE:
     PER_IMAGE_METADATA_KEYS.extend(PER_IMAGE_TIMING_KEYS)
 
-# ================ Environment variables ================ #
-NGROK_AUTH_TOKEN_ENV_VAR = "NGROK_AUTH_TOKEN"
-EMAIL_PW_TOKEN = "GMAIL_TOKEN"
-
 # ================ SSD directory constants ================ #
 SSD_NAME = "SamsungSSD"
 if SIMULATION: