pygnssutils 1.2.7__tar.gz → 1.2.9__tar.gz

{pygnssutils-1.2.7/src/pygnssutils.egg-info → pygnssutils-1.2.9}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: pygnssutils
-Version: 1.2.7
+Version: 1.2.9
 Summary: GNSS Command Line Utilities
-Author-email: Steve Smith <semuadmin@semuconsulting.com>
-Maintainer-email: Steve Smith <semuadmin@semuconsulting.com>
+Author: Steve Smith
+Author-email: semuadmin@semuconsulting.com
+Maintainer: Steve Smith
+Maintainer-email: semuadmin@semuconsulting.com
 License-Expression: BSD-3-Clause
 Project-URL: homepage, https://github.com/semuconsulting/pygnssutils
 Project-URL: documentation, https://www.semuconsulting.com/pygnssutils/
@@ -24,20 +26,22 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi>=2025.0.0
-Requires-Dist: pyserial>=3.5
-Requires-Dist: pyspartn>=1.0.8
-Requires-Dist: pyubx2>=1.3.6
+Requires-Dist: certifi>=2026.0.0
 Requires-Dist: pynmeagps>=1.1.7
+Requires-Dist: pyqgc>=1.0.0
+Requires-Dist: pyrtcm>=1.2.0
 Requires-Dist: pysbf2>=1.0.4
+Requires-Dist: pyserial>=3.5
+Requires-Dist: pyspartn>=1.0.8
+Requires-Dist: pyubx2>=1.3.7
 Requires-Dist: pyubxutils>=1.0.6
-Requires-Dist: pyqgc>=1.0.0
 Requires-Dist: pyunigps>=1.0.0
 Dynamic: license-file
 
@@ -92,18 +96,18 @@ The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnss
 
 Sphinx API Documentation in HTML format is available at [https://www.semuconsulting.com/pygnssutils](https://www.semuconsulting.com/pygnssutils).
 
-Contributions **_from human beings_** welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
+Contributions _**from human beings**_ welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
 
 [Bug reports](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) and [Feature requests](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - please use the templates provided. For general queries and advice, post a message to one of the [pygnssutils Discussions](https://github.com/semuconsulting/pygnssutils/discussions) channels.
 
-![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/master/images/nocopilot100.png?raw=true)
+![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/main/images/nocopilot100.png?raw=true)
 
 ---
 ## <a name="installation">Installation</a>
 
 ![Python version](https://img.shields.io/pypi/pyversions/pygnssutils.svg?style=flat)
 [![PyPI version](https://img.shields.io/pypi/v/pygnssutils.svg?style=flat)](https://pypi.org/project/pygnssutils/)
-[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/master/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
+[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/main/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
 
 `pygnssutils` is compatible with Python>=3.10.
 
@@ -630,6 +634,8 @@ semuadmin@semuconsulting.com
 
 ![License](https://img.shields.io/github/license/semuconsulting/pygnssutils.svg)
 
+[![ORCID iD icon](https://orcid.org/sites/default/files/images/orcid_16x16.png) https://orcid.org/0009-0002-5751-8719](https://orcid.org/0009-0002-5751-8719)
+
 `pygnssutils` is maintained entirely by unpaid volunteers. It receives no funding from advertising or corporate sponsorship. If you find the utility useful, please consider sponsoring the project with the price of a coffee...
 
 [![Sponsor](https://github.com/semuconsulting/pyubx2/blob/master/images/sponsor.png?raw=true)](https://buymeacoffee.com/semuconsulting)

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/README.md

@@ -49,18 +49,18 @@ The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnss
 
 Sphinx API Documentation in HTML format is available at [https://www.semuconsulting.com/pygnssutils](https://www.semuconsulting.com/pygnssutils).
 
-Contributions **_from human beings_** welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
+Contributions _**from human beings**_ welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
 
 [Bug reports](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) and [Feature requests](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - please use the templates provided. For general queries and advice, post a message to one of the [pygnssutils Discussions](https://github.com/semuconsulting/pygnssutils/discussions) channels.
 
-![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/master/images/nocopilot100.png?raw=true)
+![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/main/images/nocopilot100.png?raw=true)
 
 ---
 ## <a name="installation">Installation</a>
 
 ![Python version](https://img.shields.io/pypi/pyversions/pygnssutils.svg?style=flat)
 [![PyPI version](https://img.shields.io/pypi/v/pygnssutils.svg?style=flat)](https://pypi.org/project/pygnssutils/)
-[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/master/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
+[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/main/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
 
 `pygnssutils` is compatible with Python>=3.10.
 
@@ -587,6 +587,8 @@ semuadmin@semuconsulting.com
 
 ![License](https://img.shields.io/github/license/semuconsulting/pygnssutils.svg)
 
+[![ORCID iD icon](https://orcid.org/sites/default/files/images/orcid_16x16.png) https://orcid.org/0009-0002-5751-8719](https://orcid.org/0009-0002-5751-8719)
+
 `pygnssutils` is maintained entirely by unpaid volunteers. It receives no funding from advertising or corporate sponsorship. If you find the utility useful, please consider sponsoring the project with the price of a coffee...
 
 [![Sponsor](https://github.com/semuconsulting/pyubx2/blob/master/images/sponsor.png?raw=true)](https://buymeacoffee.com/semuconsulting)

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/pyproject.toml

@@ -5,8 +5,11 @@ build-backend = "setuptools.build_meta:__legacy__"
 [project]
 name = "pygnssutils"
 dynamic = ["version"]
-authors = [{ name = "Steve Smith", email = "semuadmin@semuconsulting.com" }]
-maintainers = [{ name = "Steve Smith", email = "semuadmin@semuconsulting.com" }]
+authors = [{ name = "Steve Smith" }, { email = "semuadmin@semuconsulting.com" }]
+maintainers = [
+    { name = "Steve Smith" },
+    { email = "semuadmin@semuconsulting.com" },
+]
 description = "GNSS Command Line Utilities"
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
@@ -28,20 +31,22 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Utilities",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Scientific/Engineering :: GIS",
 ]
 
 dependencies = [
-    "certifi>=2025.0.0",
-    "pyserial>=3.5",
-    "pyspartn>=1.0.8",
-    "pyubx2>=1.3.6",
+    "certifi>=2026.0.0",
     "pynmeagps>=1.1.7",
+    "pyqgc>=1.0.0",
+    "pyrtcm>=1.2.0",
     "pysbf2>=1.0.4",
+    "pyserial>=3.5",
+    "pyspartn>=1.0.8",
+    "pyubx2>=1.3.7",
     "pyubxutils>=1.0.6",
-    "pyqgc>=1.0.0",
     "pyunigps>=1.0.0",
 ]
 

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/_version.py

@@ -8,4 +8,4 @@ Created on 2 Oct 2020
 :license: BSD 3-Clause
 """
 
-__version__ = "1.2.7"
+__version__ = "1.2.9"

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/gnssntripclient.py

@@ -27,21 +27,28 @@ Created on 03 Jun 2022
 :license: BSD 3-Clause
 """
 
-import socket
-import ssl
 from base64 import b64encode
 from datetime import datetime, timedelta, timezone
 from io import BufferedWriter, TextIOWrapper
 from logging import getLogger
 from os import getenv
 from queue import Queue
+from socket import (
+    SHUT_RDWR,
+    create_connection,
+    gaierror,
+    gethostbyname,
+    socket,
+    timeout,
+)
+from ssl import PROTOCOL_TLS_CLIENT, SSLCertVerificationError, SSLContext, SSLError
 from threading import Event, Thread
+from types import NoneType
+from typing import Any
 
 from certifi import where as findcacerts
 from pynmeagps import GET, NMEAMessage, SocketWrapper
-from pyrtcm import RTCMMessageError, RTCMParseError, RTCMTypeError
-from pyspartn import SPARTNMessageError, SPARTNParseError, SPARTNReader, SPARTNTypeError
-from pyubx2 import ERR_LOG, RTCM3_PROTOCOL, UBXReader
+from pyspartn import SPARTNReader
 from serial import Serial
 
 from pygnssutils._version import __version__ as VERSION
@@ -70,6 +77,7 @@ from pygnssutils.globals import (
     PYGNSSUTILS_CRTPATH,
     VERBOSITY_MEDIUM,
 )
+from pygnssutils.gnssreader import ERR_LOG, RTCM3_PROTOCOL, GNSSReader
 from pygnssutils.helpers import find_mp_distance, ipprot2int, set_logging
 
 TIMEOUT = 3
@@ -91,13 +99,13 @@ class GNSSNTRIPClient:
 
     def __init__(
         self,
-        app=None,
+        app: Any | NoneType = None,
         **kwargs,
     ):
         """
         Constructor.
 
-        :param object app: application from which this class is invoked (None)
+        :param Any | NoneType app: application from which this class is invoked (None)
         :param int retries: (kwarg) maximum failed connection retries (5)
         :param int retryinterval: (kwarg) retry interval in seconds (10)
         :param int timeout: (kwarg) inactivity timeout in seconds (10)
@@ -185,7 +193,7 @@ class GNSSNTRIPClient:
         :param bool spartndecode: (kwarg) decode SPARTN messages (0)
         :param str | NoneType spartnkey: (kwarg) SPARTN decryption key (None)
         :param str | datetime datetime: (kwarg) SPARTN decryption basedate (now(utc))
-        :param object output: (kwarg) writeable output medium (serial, file, socket, queue) (None)
+        :param Any output: (kwarg) writeable output medium (serial, file, socket, queue) (None)
         :param Event stopevent: (kwarg) stopevent to terminate `run()` (internal `Event()`)
         :returns: boolean flag 0 = stream terminated, 1 = streaming data
         :rtype: bool
@@ -221,8 +229,8 @@ class GNSSNTRIPClient:
             daemon=True,
         ).start()
         if self.settings["mountpoint"] != "":
-            return 1
-        return 0
+            return True
+        return False
 
     def stop(self):
         """
@@ -237,7 +245,7 @@ class GNSSNTRIPClient:
         self,
         settings: dict,
         stopevent: Event,
-        output: object,
+        output: Any,
     ):
         """
         Main read thread.
@@ -247,7 +255,7 @@ class GNSSNTRIPClient:
 
         :param dict settings: settings as dictionary
         :param Event stopevent: stop event
-        :param object output: output stream for raw data
+        :param Any output: output stream for raw data
         """
 
         self._retrycount = 0
@@ -271,8 +279,8 @@ class GNSSNTRIPClient:
                 ConnectionRefusedError,
                 ConnectionResetError,
                 OverflowError,
-                socket.gaierror,
-                socket.timeout,  # subclass of OSError in Python<=3.9
+                gaierror,
+                timeout,  # subclass of OSError in Python<=3.9
                 TimeoutError,
             ) as err:
                 errm = str(repr(err))
@@ -286,14 +294,14 @@ class GNSSNTRIPClient:
                     )
                     self._app_update_status(True, (errm, ERRCOL))
             # critical errors...
-            except (ssl.SSLError, ssl.SSLCertVerificationError) as err:
-                errc = err.strerror
-                if "certificate is not valid for 'www." in err.strerror:
+            except (SSLError, SSLCertVerificationError) as err:
+                errc = str(err.strerror)
+                if "certificate is not valid for 'www." in str(err.strerror):
                     errc += (
                         f" - try using '{hostname[4:]}' rather than "
                         f"'{hostname}' for the NTRIP caster URL"
                     )
-                elif "unable to get local issuer certificate" in err.strerror:
+                elif "unable to get local issuer certificate" in str(err.strerror):
                     errc += f" - try adding the NTRIP caster URL SSL certificate to {findcacerts()}"
             except OSError:  # socket already closed, ignore
                 errc = "socket closed"
@@ -322,12 +330,12 @@ class GNSSNTRIPClient:
         """
 
         hostname = settings["server"]
-        sock = socket.create_connection(
-            (socket.gethostbyname(hostname), int(settings["port"])),
+        sock = create_connection(
+            (gethostbyname(hostname), int(settings["port"])),
             timeout=self._timeout,
         )
         if int(settings["https"]):
-            context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+            context = SSLContext(PROTOCOL_TLS_CLIENT)
             context.load_verify_locations(findcacerts())
             if int(settings.get("selfsign", 0)):
                 # context.verify_mode = ssl.CERT_NONE
@@ -336,16 +344,17 @@ class GNSSNTRIPClient:
             sock = context.wrap_socket(sock, server_hostname=hostname)
         return sock
 
-    def _close_connection(self, sock: socket):
+    def _close_connection(self, sock: socket | NoneType):
         """
         Close socket connection.
 
-        :param socket sock: open socket
+        :param socket | NoneType sock: open socket
         """
 
         try:
-            sock.shutdown(socket.SHUT_RDWR)
-            sock.close()
+            if sock is not None:
+                sock.shutdown(SHUT_RDWR)
+                sock.close()
         except (AttributeError, OSError):  # already closed, ignore
             pass
 
@@ -354,14 +363,14 @@ class GNSSNTRIPClient:
         sock: socket,
         settings: dict,
         stopevent: Event,
-        output: object,
+        output: Any,
     ) -> int:
         """
         Send HTTP request to NTRIP server and process incoming data.
 
         :param dict settings: settings as dictionary
         :param Event stopevent: stop event
-        :param object output: output stream for raw data
+        :param Any output: output stream for raw data
         :returns rc: return code (0 - stop, 1 - ok)
         :rtype: int
         :raises: Various socket error types if connection fails
@@ -497,12 +506,21 @@ class GNSSNTRIPClient:
         )
         return bdy
 
+    def _error_handler(self, err: Exception):
+        """
+        Error handler.
+
+        :param Exception err: exception
+        """
+
+        self.logger.debug(err)
+
     def _parse_ntrip_data(
         self,
         sock: socket,
         settings: dict,
         stopevent: Event,
-        output: object,
+        output: Any,
     ):
         """
         Read and parse incoming NTRIP RTCM3/SPARTN data stream.
@@ -510,6 +528,7 @@ class GNSSNTRIPClient:
         :param socket sock: raw socket
         :param dict settings: settings as dictionary
         :param Event stopevent: stop event
+        :param Any output: output medium
         :raises: TimeoutError if inactivity timeout exceeded
         """
 
@@ -528,44 +547,29 @@ class GNSSNTRIPClient:
                 decode=settings.get("spartndecode", False),
                 key=settings.get("spartnkey", "ABCD1234"),
                 basedate=settings.get("spartnbasedate", 0),
+                errorhandler=self._error_handler,
             )
         else:
-            parser = UBXReader(
+            parser = GNSSReader(
                 stream,
                 protfilter=RTCM3_PROTOCOL,
                 quitonerror=ERR_LOG,
                 bufsize=DEFAULT_BUFSIZE,
-                labelmsm=True,
+                labelmsm=1,
+                errorhandler=self._error_handler,
             )
 
         while not stopevent.is_set():
-            try:
-                raw_data, parsed_data = parser.read()
-                if raw_data is None:
-                    if datetime.now() - last_activity > timedelta(
-                        seconds=self._timeout
-                    ):
-                        raise TimeoutError(
-                            f"Inactivity timeout error after {self._timeout} seconds"
-                        )
-                else:
-                    if hasattr(parsed_data, "identity"):
-                        self.logger.debug(f"Message received: {parsed_data.identity}")
-                    self._do_output(output, raw_data, parsed_data)
-                    last_activity = datetime.now()
-                self._send_gga(sock, settings["ggainterval"], output)
-
-            except (
-                RTCMMessageError,
-                RTCMParseError,
-                RTCMTypeError,
-                SPARTNMessageError,
-                SPARTNParseError,
-                SPARTNTypeError,
-            ) as err:
-                parsed_data = f"Error parsing data stream {err}"
+            raw_data, parsed_data = parser.read()
+            if raw_data is None:
+                if datetime.now() - last_activity > timedelta(seconds=self._timeout):
+                    raise TimeoutError(
+                        f"Inactivity timeout error after {self._timeout} seconds"
+                    )
+            else:
                 self._do_output(output, raw_data, parsed_data)
-                continue
+                last_activity = datetime.now()
+            self._send_gga(sock, settings["ggainterval"], output)
 
     def _parse_sourcetable(self, response: str) -> list:
         """
@@ -576,10 +580,10 @@ class GNSSNTRIPClient:
         :rtype: list
         """
 
-        self.logger.info(f"Sourcetable:\n{response=}")
+        self.logger.debug(f"Sourcetable:\n{response=}")
         sourcetable = []
-        response = response.split("\r\n")
-        for line in response:
+        respons = response.split("\r\n")
+        for line in respons:
             if line.find("STR;") >= 0:  # mountpoint entry
                 strbits = line.split(";")
                 if strbits[0] == "STR":
@@ -601,9 +605,9 @@ class GNSSNTRIPClient:
             for i, col in enumerate(row):
                 dlm = "," if i < len(row) - 1 else "\r\n"
                 srt += f"{col}{dlm}"
-        return bytearray(srt, "utf-8")
+        return bytes(srt, "utf-8")
 
-    def _format_gga(self) -> tuple:
+    def _format_gga(self) -> tuple[bytes | NoneType, NMEAMessage | NoneType]:
         """
         Format NMEA GGA sentence using pynmeagps. The raw string
         output is suitable for sending to an NTRIP socket.
@@ -611,8 +615,7 @@ class GNSSNTRIPClient:
         derived from fix string.
 
         :returns: tuple of (raw NMEA message as bytes, NMEAMessage)
-        :rtype: tuple
-        :rtype: tuple
+        :rtype: tuple[bytes | NoneType, NMEAMessage | NoneType]
         """
 
         try:
@@ -639,36 +642,35 @@ class GNSSNTRIPClient:
                 diffStation=diffstation,
             )
 
-            raw_data = parsed_data.serialize()
-            return raw_data, parsed_data
+            return parsed_data.serialize(), parsed_data
         except ValueError:
             return None, None
 
-    def _send_gga(self, sock: socket, ggainterval: int, output: object):
+    def _send_gga(self, sock: socket, ggainterval: int, output: Any):
         """
         Send NMEA GGA sentence to NTRIP server at prescribed interval.
 
         :param socket sock: open socket
         :param int ggainterval: GGA send interval in seconds (-1 = don't send)
-        :param object output: writeable output medium e.g. serial port
+        :param Any output: writeable output medium e.g. serial port
         """
 
         if ggainterval != NOGGA:
             if datetime.now() > self._last_gga + timedelta(seconds=ggainterval):
                 raw_data, parsed_data = self._format_gga()
-                if parsed_data is not None:
+                if raw_data is not None and parsed_data is not None:
                     sock.sendall(raw_data)
                     self._do_output(output, raw_data, parsed_data)
                 self._last_gga = datetime.now()
 
-    def _get_closest_mountpoint(self) -> tuple:
+    def _get_closest_mountpoint(self) -> tuple[str | NoneType, float | NoneType]:
         """
         THREADED
         Find closest mountpoint in sourcetable
         if valid reference lat/lon are available.
 
         :returns: tuple of (mountpoint, distance)
-        :rtype: tuple
+        :rtype: tuple[str | NoneType, float | NoneType]
         """
 
         try:
@@ -678,7 +680,7 @@ class GNSSNTRIPClient:
             )
             if self._settings["mountpoint"] == "":
                 self._settings["mountpoint"] = closest_mp
-            self.logger.info(
+            self.logger.debug(
                 "Closest mountpoint to reference location "
                 f"({lat}, {lon}) = {closest_mp}, {dist} km."
             )
@@ -687,28 +689,28 @@ class GNSSNTRIPClient:
             return None, None
         return closest_mp, dist
 
-    def _do_output(self, output: object, raw: bytes, parsed: object):
+    def _do_output(self, output: Any, raw: bytes | NoneType, parsed: Any | NoneType):
         """
         Send sourcetable/closest mountpoint or RTCM3/SPARTN data to designated output medium.
 
         If output is Queue, will send both raw and parsed data.
 
-        :param object output: writeable output medium for raw data
-        :param bytes raw: raw data
-        :param object parsed: parsed message
+        :param Any output: writeable output medium for raw data
+        :param bytes | NoneType raw: raw data
+        :param Any | NoneType parsed: parsed message
         """
 
         if output is not None:
             # serialize sourcetable if outputting to stream
             if isinstance(raw, list) and not isinstance(output, Queue):
                 raw = self._serialize_sourcetable(raw)
-            if isinstance(output, (Serial, BufferedWriter)):
+            if isinstance(output, (Serial, BufferedWriter)) and raw is not None:
                 output.write(raw)
-            elif isinstance(output, TextIOWrapper):
+            elif isinstance(output, TextIOWrapper) and parsed is not None:
                 output.write(str(parsed))
-            elif isinstance(output, Queue):
+            elif isinstance(output, Queue) and raw is not None:
                 output.put(raw if self.__app == CLIAPP else (raw, parsed))
-            elif isinstance(output, socket.socket):
+            elif isinstance(output, socket) and raw is not None:
                 output.sendall(raw)
 
         # notify any calling app that data is available
@@ -716,18 +718,18 @@ class GNSSNTRIPClient:
             if hasattr(self.__app, "set_event"):
                 self.__app.set_event(NTRIP_EVENT)
 
-    def _app_update_status(self, status: bool, msgt: tuple = None):
+    def _app_update_status(self, status: bool, msgt: tuple[str, str]):
         """
         Update NTRIP connection status in calling application.
 
         :param bool status: NTRIP server connection status
-        :param tuple msgt: (message, color)
+        :param tuple[str,str] msgt: (message, color)
         """
 
         if msgt[1] == ERRCOL:
             self.logger.error(msgt[0])
         else:
-            self.logger.info(msgt[0])
+            self.logger.debug(msgt[0])
         if self.__app is not None:
             if hasattr(self.__app, "dialog"):
                 dlg = self.__app.dialog(DLGTNTRIP)
@@ -866,15 +868,17 @@ class GNSSNTRIPClient:
         return self._response_headers.get("content-type", "")
 
     @property
-    def response_body(self) -> object:
+    def response_body(self) -> bytes | str | NoneType:
         """
         Get response body if available.
 
         :returns: response body as bytes or string, depending on encoding
-        :rtype: object
+        :rtype: bytes | str | NoneType
         """
 
-        if "text/" in self.content_type or self.is_sourcetable:
+        if isinstance(self._response_body, bytes) and (
+            "text/" in self.content_type or self.is_sourcetable
+        ):
             return self._response_body.decode()
         return self._response_body
 

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/gnssreader.py

@@ -13,7 +13,7 @@ Returns both the raw binary data (as bytes) and the parsed data.
 
 - 'protfilter' governs which protocols (NMEA, UBX, SBF, QGC, UNI or RTCM3) are processed.
 - 'msgfilter' governs which individual message types are processed.
-- `parsing` governs whether payloads are fully or partially parsed.
+- `parsing` governs whether individual payloads are parsed.
 - 'quitonerror' governs how errors are handled.
 - 'msgmode' indicates the type of UBX datastream (output GET, input SET, query POLL).
   If msgmode is set to SETPOLL, input/query mode will be automatically detected by parser.
@@ -29,7 +29,7 @@ Created on 6 Oct 2025
 
 from logging import getLogger
 from socket import socket
-from types import FunctionType, NoneType
+from types import FunctionType, MethodType, NoneType
 from typing import Any, Literal
 
 from pynmeagps import (
@@ -236,7 +236,7 @@ class GNSSReader:
         bufsize: int = DEFAULT_BUFSIZE,
         parsing: Literal[0, 1, 2] = PARSE_FULL,
         msgfilter: tuple | int | str = "",
-        errorhandler: FunctionType | NoneType = None,
+        errorhandler: FunctionType | MethodType | NoneType = None,
     ):
         """Constructor.
 
@@ -318,8 +318,7 @@ class GNSSReader:
 
         raw_data = None
         parsed_data = None
-        parsing = True
-        while parsing:  # loop until end of valid message or EOF
+        while True:  # loop until end of valid message or EOF
             try:
 
                 raw_data = None
@@ -336,38 +335,34 @@ class GNSSReader:
                     # if protocol filter passes UBX, return message,
                     # otherwise discard and continue
                     if self._protfilter & UBX_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an NMEA message (b'\x24\x..)
-                elif bytehdr in NMEA_HDR:
+                if bytehdr in NMEA_HDR:
                     raw_data, parsed_data = self._parse_nmea(bytehdr)
                     # if protocol filter passes NMEA, return message,
                     # otherwise discard and continue
                     if self._protfilter & NMEA_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an SBF message (b'\x24\x40')
-                elif bytehdr in SBF_HDR:
+                if bytehdr in SBF_HDR:
                     raw_data, parsed_data = self._parse_sbf(bytehdr)
                     # if protocol filter passes SBF, return message,
                     # otherwise discard and continue
                     if self._protfilter & SBF_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an QGCmessage (b'\x51\x47')
-                elif bytehdr in QGC_HDR:
+                if bytehdr in QGC_HDR:
                     raw_data, parsed_data = self._parse_qgc(bytehdr)
                     # if protocol filter passes QGC, return message,
                     # otherwise discard and continue
                     if self._protfilter & QGC_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an UNImessage (b'\xaa\x44\xb5')
-                elif bytehdr in UNI_HDR[:2]:
+                if bytehdr in UNI_HDR[:2]:
                     byte3 = self._read_bytes(1)
                     bytehdr += byte3
                     if bytehdr != UNI_HDR:
@@ -376,21 +371,18 @@ class GNSSReader:
                     # if protocol filter passes UNI, return message,
                     # otherwise discard and continue
                     if self._protfilter & UNI_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's a RTCM3 message
                 # (byte1 = 0xd3; byte2 = 0b000000**)
-                elif byte1 == b"\xd3" and (byte2[0] & ~0x03) == 0:
+                if byte1 == b"\xd3" and (byte2[0] & ~0x03) == 0:
                     raw_data, parsed_data = self._parse_rtcm3(bytehdr)
                     # if protocol filter passes RTCM, return message,
                     # otherwise discard and continue
                     if self._protfilter & RTCM3_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
-                else:
-                    raise GNSSStreamError(f"Unknown protocol header {bytehdr}.")
+                        break
+                    continue
+                raise GNSSStreamError(f"Unknown protocol header {escapeall(bytehdr)}.")
 
             except EOFError:
                 return (None, None)
@@ -682,17 +674,17 @@ class GNSSReader:
             # pass to error handler if there is one
             # else just log
             if self._errorhandler is None:
-                self._logger.error(err)
+                self._logger.exception(err)
             else:
                 self._errorhandler(err)
 
     @property
-    def datastream(self) -> object:
+    def datastream(self) -> Any:
         """
         Getter for stream.
 
         :return: data stream
-        :rtype: object
+        :rtype: Any
         """
 
         return self._stream

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/helpers.py

@@ -253,7 +253,7 @@ def get_mp_distance(lat: float, lon: float, mp: list) -> float:
 
 def find_mp_distance(
     lat: float, lon: float, sourcetable: list, name: str = ""
-) -> tuple:
+) -> tuple[str, float]:
     """
     Find distance to named mountpoint. If mountpoint name
     is not provided, find closest mountpoint in sourcetable.
@@ -269,11 +269,11 @@ def find_mp_distance(
     :param list sourcetable: sourcetable as list
     :param str name: (optional) mountpoint name (None)
     :returns: tuple of (name of closest mountpoint, distance in km)
-    :rtype: tuple
+    :rtype: tuple[str, float]
     """
 
     mindist = 9999999
-    mpname = None
+    mpname = ""
     for mp in sourcetable:
         dist = get_mp_distance(lat, lon, mp)
         if dist is not None:

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/rinex_conv.py

@@ -42,7 +42,6 @@ from pygnssutils.rinex_globals import (
     RINEX_OK,
     RINEXDATASOURCE,
     RINEXVER_DEFAULT,
-    RTCM3,
     UBLOX,
 )
 from pygnssutils.rinex_helpers import (

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils/rinex_conv_met.py

@@ -56,7 +56,7 @@ class RinexConverterMeteorology:
         verbosity: Literal[-1, 0, 1, 2, 3] = VERBOSITY_MEDIUM,
         logtofile: str = "",
         **kwargs,
-    ):  # pylint: disable=too-many-arguments, too-many-positional-arguments
+    ):  # pylint: disable=too-many-arguments, too-many-positional-arguments, unused-argument
         """
         Constructor.
 
@@ -111,12 +111,12 @@ class RinexConverterMeteorology:
         ret = 0
         if isinstance(parsed, NMEAMessage):
             self._datasource = NMEA
-            if parsed.identity[2:] in ("RMC"):
+            if parsed.identity[2:] == "RMC":
                 self.get_nmea_epoch(parsed)
-            if parsed.identity[2:] in ("MWD"):  # NMEA Wind Speed and Direction
+            if parsed.identity[2:] == "MWD":  # NMEA Wind Speed and Direction
                 self.convert_nmea_mwd(parsed)
                 ret += 1
-            if parsed.identity[2:] in ("XDR"):  # NMEA Transducer (Temp & Pressure)
+            if parsed.identity[2:] == "XDR":  # NMEA Transducer (Temp & Pressure)
                 self.convert_nmea_xdr(parsed)
                 ret += 1
         # ADD ADDITIONAL PARSED DATA SOURCES HERE...

{pygnssutils-1.2.7 → pygnssutils-1.2.9/src/pygnssutils.egg-info}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: pygnssutils
-Version: 1.2.7
+Version: 1.2.9
 Summary: GNSS Command Line Utilities
-Author-email: Steve Smith <semuadmin@semuconsulting.com>
-Maintainer-email: Steve Smith <semuadmin@semuconsulting.com>
+Author: Steve Smith
+Author-email: semuadmin@semuconsulting.com
+Maintainer: Steve Smith
+Maintainer-email: semuadmin@semuconsulting.com
 License-Expression: BSD-3-Clause
 Project-URL: homepage, https://github.com/semuconsulting/pygnssutils
 Project-URL: documentation, https://www.semuconsulting.com/pygnssutils/
@@ -24,20 +26,22 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi>=2025.0.0
-Requires-Dist: pyserial>=3.5
-Requires-Dist: pyspartn>=1.0.8
-Requires-Dist: pyubx2>=1.3.6
+Requires-Dist: certifi>=2026.0.0
 Requires-Dist: pynmeagps>=1.1.7
+Requires-Dist: pyqgc>=1.0.0
+Requires-Dist: pyrtcm>=1.2.0
 Requires-Dist: pysbf2>=1.0.4
+Requires-Dist: pyserial>=3.5
+Requires-Dist: pyspartn>=1.0.8
+Requires-Dist: pyubx2>=1.3.7
 Requires-Dist: pyubxutils>=1.0.6
-Requires-Dist: pyqgc>=1.0.0
 Requires-Dist: pyunigps>=1.0.0
 Dynamic: license-file
 
@@ -92,18 +96,18 @@ The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnss
 
 Sphinx API Documentation in HTML format is available at [https://www.semuconsulting.com/pygnssutils](https://www.semuconsulting.com/pygnssutils).
 
-Contributions **_from human beings_** welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
+Contributions _**from human beings**_ welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
 
 [Bug reports](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) and [Feature requests](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - please use the templates provided. For general queries and advice, post a message to one of the [pygnssutils Discussions](https://github.com/semuconsulting/pygnssutils/discussions) channels.
 
-![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/master/images/nocopilot100.png?raw=true)
+![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/main/images/nocopilot100.png?raw=true)
 
 ---
 ## <a name="installation">Installation</a>
 
 ![Python version](https://img.shields.io/pypi/pyversions/pygnssutils.svg?style=flat)
 [![PyPI version](https://img.shields.io/pypi/v/pygnssutils.svg?style=flat)](https://pypi.org/project/pygnssutils/)
-[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/master/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
+[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/main/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
 
 `pygnssutils` is compatible with Python>=3.10.
 
@@ -630,6 +634,8 @@ semuadmin@semuconsulting.com
 
 ![License](https://img.shields.io/github/license/semuconsulting/pygnssutils.svg)
 
+[![ORCID iD icon](https://orcid.org/sites/default/files/images/orcid_16x16.png) https://orcid.org/0009-0002-5751-8719](https://orcid.org/0009-0002-5751-8719)
+
 `pygnssutils` is maintained entirely by unpaid volunteers. It receives no funding from advertising or corporate sponsorship. If you find the utility useful, please consider sponsoring the project with the price of a coffee...
 
 [![Sponsor](https://github.com/semuconsulting/pyubx2/blob/master/images/sponsor.png?raw=true)](https://buymeacoffee.com/semuconsulting)

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/src/pygnssutils.egg-info/requires.txt

@@ -1,9 +1,10 @@
-certifi>=2025.0.0
-pyserial>=3.5
-pyspartn>=1.0.8
-pyubx2>=1.3.6
+certifi>=2026.0.0
 pynmeagps>=1.1.7
+pyqgc>=1.0.0
+pyrtcm>=1.2.0
 pysbf2>=1.0.4
+pyserial>=3.5
+pyspartn>=1.0.8
+pyubx2>=1.3.7
 pyubxutils>=1.0.6
-pyqgc>=1.0.0
 pyunigps>=1.0.0

{pygnssutils-1.2.7 → pygnssutils-1.2.9}/tests/test_static.py

@@ -115,14 +115,14 @@ class StaticTest(unittest.TestCase):
         lon = -2.24
         name = "AUADL"
         res = find_mp_distance(lat, lon, TESTSRT, name)
-        self.assertEqual(res, (None, 9999999))
+        self.assertEqual(res, ("", 9999999))
 
     def testfindmpdist4(self):  # invalid coords
         name = "apinhal"
         lat = ""
         lon = ""
         res = find_mp_distance(lat, lon, TESTSRT, name)
-        self.assertEqual(res, (None, 9999999))
+        self.assertEqual(res, ("", 9999999))
 
     def testgetmpdist1(self):  # valid
         mp = TESTSRT[12]