Merge pull request #38 from MrClock8163/change/geocompy-update

Updates for new GeoComPy

Author: MrClock8163

pyproject.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "pyserial ~= 3.5.0",
-    "geocompy >= 0.13.0",
+    "geocompy ~= 0.14.0",
     "rich >= 13.9",
     "textual >= 3.2.0",
     "rapidfuzz ~= 3.13.0",

src/instrumentman/control/app.py

@@ -11,7 +11,7 @@
 def main_shutdown_gsidna(
     port: str,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     baud: int = 9600,
     sync_after_timeout: bool = False
 ) -> None:
@@ -20,11 +20,11 @@ def main_shutdown_gsidna(
         port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        instrument = GsiOnlineDNA(com, logger.getChild("instrument"))
+        instrument = GsiOnlineDNA(com, logger=logger.getChild("instrument"))
         resp = instrument.shutdown()
 
         if resp.value:
@@ -38,7 +38,7 @@ def main_shutdown_geocom(
     component: str,
     port: str,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     baud: int = 9600,
     sync_after_timeout: bool = False
 ) -> None:
@@ -47,11 +47,11 @@ def main_shutdown_geocom(
         port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        instrument = GeoCom(com, logger.getChild("instrument"))
+        instrument = GeoCom(com, logger=logger.getChild("instrument"))
 
         match component:
             case "protocol":
@@ -81,7 +81,7 @@ def main_shutdown_geocom(
 def main_startup_gsidna(
     port: str,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     baud: int = 9600,
     sync_after_timeout: bool = False
 ) -> None:
@@ -90,11 +90,11 @@ def main_startup_gsidna(
         port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        instrument = GsiOnlineDNA(com, logger.getChild("instrument"))
+        instrument = GsiOnlineDNA(com, logger=logger.getChild("instrument"))
         resp = instrument.wakeup()
 
         if resp.value:
@@ -108,7 +108,7 @@ def main_startup_geocom(
     component: str,
     port: str,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     baud: int = 9600,
     sync_after_timeout: bool = False
 ) -> None:
@@ -117,11 +117,11 @@ def main_startup_geocom(
         port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        instrument = GeoCom(com, logger.getChild("instrument"))
+        instrument = GeoCom(com, logger=logger.getChild("instrument"))
 
         match component:
             case "instrument":

src/instrumentman/datatransfer/app.py

@@ -1,7 +1,6 @@
 from io import BufferedWriter, TextIOWrapper
 from logging import getLogger
 
-from serial import SerialTimeoutException
 from rich.progress import Progress, TextColumn, BarColumn, TimeElapsedColumn
 from geocompy.communication import open_serial
 
@@ -92,7 +91,7 @@ def main_download(
                             total=lines
                         )
                         break
-                except SerialTimeoutException:
+                except TimeoutError:
                     if started and autoclose:
                         logger.info("Download finished (timeout)")
                         print_success("Download finished due to timeout")

src/instrumentman/filetransfer/app.py

@@ -307,7 +307,7 @@ def main_download(
     output: BufferedWriter,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     device: str = "internal",
     filetype: str = "unknown",
@@ -319,11 +319,11 @@ def main_download(
         port=port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         try:
             run_download(
                 tps,
@@ -344,7 +344,7 @@ def main_list(
     directory: str = "/",
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     device: str = "internal",
     filetype: str | None = None,
@@ -355,11 +355,11 @@ def main_list(
         port=port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         try:
             run_listing_tree(
                 tps,

src/instrumentman/inclination/app.py

@@ -115,7 +115,7 @@ def main_measure(
     port: str,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     output: TextIOWrapper | None = None,
     positions: int = 1,
@@ -126,13 +126,13 @@ def main_measure(
     logger.info(f"Opening connection on {port}")
     with open_serial(
         port,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
         timeout=timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         run_measure(
             tps,
             logger,

src/instrumentman/jobs/app.py

@@ -73,7 +73,7 @@ def main_list(
     port: str,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     device: str = "internal"
 ) -> None:
@@ -82,11 +82,11 @@ def main_list(
         port=port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         try:
             run_listing(tps, _DEVICE[device], logger)
         finally:

src/instrumentman/morse/app.py

@@ -133,7 +133,7 @@ def main(
     ignore_non_ascii: bool = False,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     unittime: int = 50,
     compatibility: str = "none",
@@ -151,11 +151,11 @@ def main(
         port,
         speed=baud,
         timeout=timeout,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         beepstart = tps.bmm.beep_start
         beepstop = tps.bmm.beep_stop
         match compatibility.lower():

src/instrumentman/panorama/measure.py

@@ -396,7 +396,7 @@ def main(
     metadata: TextIO,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     zoom: str = "x1",
     overlap: tuple[int, int] = (5, 10),
@@ -411,13 +411,13 @@ def main(
     logger = getLogger("iman.panorama.measure")
     with open_serial(
         port,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
         timeout=timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         tolerances: tuple[Angle, Angle] | None = None
         try:
             resp_tol = tps.aut.get_tolerance()

src/instrumentman/protocoltest/app.py

@@ -5,7 +5,6 @@
 from rich.live import Live
 from rich.table import Table, Column
 from rich.prompt import Confirm
-from serial import SerialException
 from geocompy.data import Angle
 from geocompy.geo import GeoCom
 from geocompy.geo.gcdata import Device
@@ -145,7 +144,7 @@ def main(
     protocol: str,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False
 ) -> None:
     logger = getLogger("iman.protocoltest")
@@ -154,23 +153,29 @@ def main(
             port,
             speed=baud,
             timeout=timeout,
-            retry=retry,
+            attempts=attempts,
             sync_after_timeout=sync_after_timeout,
             logger=logger.getChild("com")
         ) as com:
             try:
                 if protocol == "geocom":
-                    tps = GeoCom(com, logger.getChild("instrument"))
+                    tps = GeoCom(
+                        com,
+                        logger=logger.getChild("instrument")
+                    )
                     tests_geocom(tps, logger)
                 elif protocol == "gsidna":
-                    dna = GsiOnlineDNA(com, logger.getChild("instrument"))
+                    dna = GsiOnlineDNA(
+                        com,
+                        logger=logger.getChild("instrument")
+                    )
                     tests_gsidna(dna, logger)
             except Exception:
                 print_error("An exception occured while running the tests")
                 logger.exception(
                     "An exception occured while running the tests"
                 )
 
-    except (SerialException, ConnectionError) as e:
+    except (ConnectionRefusedError, ConnectionError) as e:
         print_error(f"Connection was not successful ({e})")
         logger.exception("Connection was not successful")

src/instrumentman/setmeasurement/measure.py

@@ -180,7 +180,7 @@ def main(
     output: str,
     baud: int = 9600,
     timeout: int = 15,
-    retry: int = 1,
+    attempts: int = 1,
     sync_after_timeout: bool = False,
     dateformat: str = "%Y%m%d",
     timeformat: str = "%H%M%S",
@@ -192,13 +192,13 @@ def main(
     logger = getLogger("iman.sets.measure")
     with open_serial(
         port,
-        retry=retry,
+        attempts=attempts,
         sync_after_timeout=sync_after_timeout,
         speed=baud,
         timeout=timeout,
         logger=logger.getChild("com")
     ) as com:
-        tps = GeoCom(com, logger.getChild("instrument"))
+        tps = GeoCom(com, logger=logger.getChild("instrument"))
         if sync_time:
             tps.csv.set_datetime(datetime.now())
             logger.info("Synced instrument date-time to computer")