updated apps to pass logger to connection

Author: MrClock8163

src/instrumentman/datatransfer/app.py

@@ -20,12 +20,11 @@ def main_download(
 ) -> None:
     eof_bytes = eof.encode("ascii")
     logger = getLogger("iman.data.download")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(f"Connection parameters: baud={baud:d}, timeout={timeout:d}")
     with open_serial(
         port,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         eol_bytes = com.eombytes
         started = False
@@ -65,8 +64,6 @@ def main_download(
                 logger.exception("Download interrupted by error")
                 break
 
-    logger.info(f"Closed connection on {port}")
-
 
 def main_upload(
     port: str,
@@ -76,12 +73,11 @@ def main_upload(
     skip: int = 0
 ) -> None:
     logger = getLogger("iman.data.upload")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(f"Connection parameters: baud={baud:d}, timeout={timeout:d}")
     with open_serial(
         port,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         try:
             logger.info("Starting data upload")
@@ -104,5 +100,4 @@ def main_upload(
             logger.exception("Upload interrupted by error")
         else:
             echo_green("Upload finished")
-
-    logger.info(f"Closed connection on {port}")
+            logger.info("Upload finished")

src/instrumentman/filetransfer/app.py

@@ -202,6 +202,7 @@ def run_listing_tree(
     filetype: str | None,
     depth: int = 1
 ) -> None:
+    filetype = filetype or "unknown"
     console = Console(width=120)
     logger.info(
         f"Starting content listing of '{directory}' from '{dev}' device"
@@ -310,17 +311,13 @@ def main_download(
     large: bool = False
 ) -> None:
     logger = getLogger("iman.files.download")
-    logger.info(f"Starting connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port=port,
         speed=baud,
         timeout=timeout,
         retry=retry,
-        sync_after_timeout=sync_after_timeout
+        sync_after_timeout=sync_after_timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         try:
@@ -337,8 +334,6 @@ def main_download(
         finally:
             tps.ftr.abort_download()
 
-    logger.info(f"Closed connection on {port}")
-
 
 def main_list(
     port: str,
@@ -352,17 +347,13 @@ def main_list(
     depth: int = 1
 ) -> None:
     logger = getLogger("iman.files.list")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port=port,
         speed=baud,
         timeout=timeout,
         retry=retry,
-        sync_after_timeout=sync_after_timeout
+        sync_after_timeout=sync_after_timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         try:
@@ -376,5 +367,3 @@ def main_list(
             )
         finally:
             tps.ftr.abort_listing()
-
-    logger.info(f"Closed connection on {port}")

src/instrumentman/inclination/app.py

@@ -114,16 +114,13 @@ def main_measure(
 ) -> None:
     logger = getLogger("iman.inclination.measure")
     logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         retry=retry,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         run_measure(
@@ -135,8 +132,6 @@ def main_measure(
             cycles
         )
 
-    logger.info(f"Closed connection on {port}")
-
 
 def main_merge(
     inputs: list[TextIOWrapper],

src/instrumentman/jobs/app.py

@@ -66,22 +66,16 @@ def main_list(
     sync_after_timeout: bool = False
 ) -> None:
     logger = getLogger("iman.jobs.list")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port=port,
         speed=baud,
         timeout=timeout,
         retry=retry,
-        sync_after_timeout=sync_after_timeout
+        sync_after_timeout=sync_after_timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         try:
             run_listing(tps, logger)
         finally:
             tps.csv.abort_listing()
-
-    logger.info(f"Closed connection on {port}")

src/instrumentman/morse/app.py

@@ -146,17 +146,13 @@ def main(
             logger.critical("Message contains non-ASCII characters.")
             exit(1)
 
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         speed=baud,
         timeout=timeout,
         retry=retry,
-        sync_after_timeout=sync_after_timeout
+        sync_after_timeout=sync_after_timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         beepstart = tps.bmm.beep_start
@@ -176,5 +172,3 @@ def main(
             message,
             unittime * 1e-3
         )
-
-    logger.info(f"Closed connection on {port}")

src/instrumentman/protocoltest/app.py

@@ -153,18 +153,14 @@ def main(
     sync_after_timeout: bool = False
 ) -> None:
     logger = getLogger("iman.protocoltest")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     try:
         with open_serial(
             port,
             speed=baud,
             timeout=timeout,
             retry=retry,
-            sync_after_timeout=sync_after_timeout
+            sync_after_timeout=sync_after_timeout,
+            logger=logger.getChild("com")
         ) as com:
             try:
                 if protocol == "geocom":
@@ -182,5 +178,3 @@ def main(
     except (SerialException, ConnectionError) as e:
         echo_red(f"Connection was not successful ({e})")
         logger.exception("Connection was not successful")
-
-    logger.info(f"Closed connection on {port}")

src/instrumentman/setmeasurement/measure.py

@@ -168,8 +168,8 @@ def measure_set(
 
     logger.info("Finished set measurements")
     progress.stop()
-    tps.aut.turn_to(0, Angle(180, 'deg'))
     logger.info("Returning to face-down position")
+    tps.aut.turn_to(0, Angle(180, 'deg'))
 
     return session
 
@@ -189,17 +189,13 @@ def main(
     points: str = ""
 ) -> None:
     logger = getLogger("iman.sets.measure")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         retry=retry,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         if sync_time:
@@ -215,8 +211,6 @@ def main(
             points
         )
 
-    logger.info(f"Closed connection on {port}")
-
     timestamp = session.cycles[0].time.strftime("%Y%m%d_%H%M%S")
     filename = os.path.join(
         directory,

src/instrumentman/settings/load.py

@@ -135,17 +135,13 @@ def main(
         logger.critical("Settings file does not follow schema")
         exit(1)
 
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         retry=retry,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         match data["protocol"]:
             case "geocom":
@@ -156,4 +152,3 @@ def main(
                 upload_settings_gsidna(dna, logger, data)
 
     echo_green(f"Settings loaded from {settings}")
-    logger.info(f"Closed connection on {port}")

src/instrumentman/settings/save.py

@@ -270,17 +270,13 @@ def main(
     defaults: bool = False
 ) -> None:
     logger = getLogger("iman.settings.save")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         retry=retry,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         match protocol:
             case "geocom":
@@ -290,8 +286,6 @@ def main(
                 dna = GsiOnlineDNA(com, logger.getChild("instrument"))
                 data = download_settings_gsidna(dna, logger, defaults)
 
-    logger.info(f"Closed connection on {port}")
-
     data = clean_settings(data)
     logger.info("Removed empty options")
 

src/instrumentman/setup/app.py

@@ -166,17 +166,13 @@ def main_measure(
     sync_after_timeout: bool = False
 ) -> None:
     logger = getLogger("iman.targets.measure")
-    logger.info(f"Opening connection on {port}")
-    logger.debug(
-        f"Connection parameters: baud={baud:d}, timeout={timeout:d}, "
-        f"tries={retry:d}, sync-after-timeout={str(sync_after_timeout)}"
-    )
     with open_serial(
         port,
         retry=retry,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
-        timeout=timeout
+        timeout=timeout,
+        logger=logger.getChild("com")
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         targets = measure_targets(tps, logger, output)
@@ -185,8 +181,6 @@ def main_measure(
             logger.info("Program was cancelled or no targets were recorded")
             exit(0)
 
-    logger.info(f"Closed connection on {port}")
-
     if targets is not None:
         export_targets_to_json(output, targets)
         echo_green(f"Saved target results to '{output}'")