aprsd 3.4.3__py3-none-any.whl → 4.0.0__py3-none-any.whl

aprsd/log/log.py

@@ -1,5 +1,4 @@
 import logging
-from logging.handlers import QueueHandler
 import queue
 import sys
 
@@ -8,7 +7,6 @@ from oslo_config import cfg
 
 from aprsd.conf import log as conf_log
 
-
 CONF = cfg.CONF
 # LOG = logging.getLogger("APRSD")
 LOG = logger
@@ -19,6 +17,7 @@ class QueueLatest(queue.Queue):
 
     This prevents the queue from blowing up in size.
     """
+
     def put(self, *args, **kwargs):
         try:
             super().put(*args, **kwargs)
@@ -44,7 +43,9 @@ class InterceptHandler(logging.Handler):
             frame = frame.f_back
             depth += 1
 
-        logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
+        logger.opt(depth=depth, exception=record.exc_info).log(
+            level, record.getMessage()
+        )
 
 
 # Setup the log faciility
@@ -60,43 +61,18 @@ def setup_logging(loglevel=None, quiet=False):
     logging.root.handlers = [InterceptHandler()]
     logging.root.setLevel(log_level)
 
-    imap_list = [
-        "imapclient.imaplib", "imaplib", "imapclient",
-        "imapclient.util",
-    ]
-    aprslib_list = [
+    # We don't really want to see the aprslib parsing debug output.
+    disable_list = [
         "aprslib",
         "aprslib.parsing",
         "aprslib.exceptions",
     ]
-    webserver_list = [
-        "werkzeug",
-        "werkzeug._internal",
-        "socketio",
-        "urllib3.connectionpool",
-        "chardet",
-        "chardet.charsetgroupprober",
-        "chardet.eucjpprober",
-        "chardet.mbcharsetprober",
-    ]
-
-    # We don't really want to see the aprslib parsing debug output.
-    disable_list = imap_list + aprslib_list + webserver_list
 
     # remove every other logger's handlers
     # and propagate to root logger
     for name in logging.root.manager.loggerDict.keys():
         logging.getLogger(name).handlers = []
-        if name in disable_list:
-            logging.getLogger(name).propagate = False
-        else:
-            logging.getLogger(name).propagate = True
-
-    if CONF.webchat.disable_url_request_logging:
-        for name in webserver_list:
-            logging.getLogger(name).handlers = []
-            logging.getLogger(name).propagate = True
-            logging.getLogger(name).setLevel(logging.ERROR)
+        logging.getLogger(name).propagate = name not in disable_list
 
     handlers = [
         {
@@ -118,21 +94,6 @@ def setup_logging(loglevel=None, quiet=False):
             },
         )
 
-    if CONF.email_plugin.enabled and CONF.email_plugin.debug:
-        for name in imap_list:
-            logging.getLogger(name).propagate = True
-
-    if CONF.admin.web_enabled:
-        qh = QueueHandler(logging_queue)
-        handlers.append(
-            {
-                "sink": qh, "serialize": False,
-                "format": CONF.logging.logformat,
-                "level": log_level,
-                "colorize": False,
-            },
-        )
-
     # configure loguru
     logger.configure(handlers=handlers)
     logger.level("DEBUG", color="<fg #BABABA>")

aprsd/main.py

@@ -22,11 +22,11 @@
 # python included libs
 import datetime
 import importlib.metadata as imp
-from importlib.metadata import version as metadata_version
 import logging
 import signal
 import sys
 import time
+from importlib.metadata import version as metadata_version
 
 import click
 from oslo_config import cfg, generator
@@ -36,7 +36,6 @@ import aprsd
 from aprsd import cli_helper, packets, threads, utils
 from aprsd.stats import collector
 
-
 # setup the global logger
 # log.basicConfig(level=log.DEBUG) # level=10
 CONF = cfg.CONF
@@ -54,8 +53,14 @@ def cli(ctx):
 
 def load_commands():
     from .cmds import (  # noqa
-        completion, dev, fetch_stats, healthcheck, list_plugins, listen,
-        send_message, server, webchat,
+        completion,
+        dev,
+        fetch_stats,
+        healthcheck,
+        list_plugins,
+        listen,
+        send_message,
+        server,
     )
 
 
@@ -79,11 +84,15 @@ def signal_handler(sig, frame):
             ),
         )
         time.sleep(1.5)
-        packets.PacketTrack().save()
-        packets.WatchList().save()
-        packets.SeenList().save()
-        packets.PacketList().save()
-        collector.Collector().collect()
+        try:
+            packets.PacketTrack().save()
+            packets.WatchList().save()
+            packets.SeenList().save()
+            packets.PacketList().save()
+            collector.Collector().collect()
+        except Exception as e:
+            LOG.error(f"Failed to save data: {e}")
+            sys.exit(0)
         # signal.signal(signal.SIGTERM, sys.exit(0))
         # sys.exit(0)
 
@@ -111,6 +120,7 @@ def sample_config(ctx):
 
     def _get_selected_entry_points():
         import sys
+
         if sys.version_info < (3, 10):
             all = imp.entry_points()
             selected = []

aprsd/packets/__init__.py

@@ -1,15 +1,25 @@
 from aprsd.packets import collector
 from aprsd.packets.core import (  # noqa: F401
-    AckPacket, BeaconPacket, BulletinPacket, GPSPacket, MessagePacket,
-    MicEPacket, ObjectPacket, Packet, RejectPacket, StatusPacket,
-    ThirdPartyPacket, UnknownPacket, WeatherPacket, factory,
+    AckPacket,
+    BeaconPacket,
+    BulletinPacket,
+    GPSPacket,
+    MessagePacket,
+    MicEPacket,
+    ObjectPacket,
+    Packet,
+    RejectPacket,
+    StatusPacket,
+    ThirdPartyPacket,
+    UnknownPacket,
+    WeatherPacket,
+    factory,
 )
 from aprsd.packets.packet_list import PacketList  # noqa: F401
 from aprsd.packets.seen_list import SeenList  # noqa: F401
 from aprsd.packets.tracker import PacketTrack  # noqa: F401
 from aprsd.packets.watch_list import WatchList  # noqa: F401
 
-
 # Register all the packet tracking objects.
 collector.PacketCollector().register(PacketList)
 collector.PacketCollector().register(SeenList)

aprsd/packets/core.py

@@ -1,20 +1,23 @@
-from dataclasses import dataclass, field
-from datetime import datetime
 import logging
 import re
 import time
+from dataclasses import dataclass, field
+from datetime import datetime
+
 # Due to a failure in python 3.8
 from typing import Any, List, Optional, Type, TypeVar, Union
 
 from aprslib import util as aprslib_util
 from dataclasses_json import (
-    CatchAll, DataClassJsonMixin, Undefined, dataclass_json,
+    CatchAll,
+    DataClassJsonMixin,
+    Undefined,
+    dataclass_json,
 )
 from loguru import logger
 
 from aprsd.utils import counter
 
-
 # For mypy to be happy
 A = TypeVar("A", bound="DataClassJsonMixin")
 Json = Union[dict, list, str, int, float, bool, None]
@@ -51,7 +54,7 @@ def _init_send_time():
     return NO_DATE
 
 
-def _init_msgNo():    # noqa: N802
+def _init_msgNo():  # noqa: N802
     """For some reason __post__init doesn't get called.
 
     So in order to initialize the msgNo field in the packet
@@ -63,15 +66,11 @@ def _init_msgNo():    # noqa: N802
 
 
 def _translate_fields(raw: dict) -> dict:
-    translate_fields = {
-        "from": "from_call",
-        "to": "to_call",
-    }
-    # First translate some fields
-    for key in translate_fields:
-        if key in raw:
-            raw[translate_fields[key]] = raw[key]
-            del raw[key]
+    # Direct key checks instead of iteration
+    if "from" in raw:
+        raw["from_call"] = raw.pop("from")
+    if "to" in raw:
+        raw["to_call"] = raw.pop("to")
 
     # addresse overrides to_call
     if "addresse" in raw:
@@ -88,14 +87,16 @@ class Packet:
     to_call: Optional[str] = field(default=None)
     addresse: Optional[str] = field(default=None)
     format: Optional[str] = field(default=None)
-    msgNo: Optional[str] = field(default=None)   # noqa: N815
-    ackMsgNo: Optional[str] = field(default=None)   # noqa: N815
+    msgNo: Optional[str] = field(default=None)  # noqa: N815
+    ackMsgNo: Optional[str] = field(default=None)  # noqa: N815
     packet_type: Optional[str] = field(default=None)
     timestamp: float = field(default_factory=_init_timestamp, compare=False, hash=False)
     # Holds the raw text string to be sent over the wire
     # or holds the raw string from input packet
     raw: Optional[str] = field(default=None, compare=False, hash=False)
-    raw_dict: dict = field(repr=False, default_factory=lambda: {}, compare=False, hash=False)
+    raw_dict: dict = field(
+        repr=False, default_factory=lambda: {}, compare=False, hash=False
+    )
     # Built by calling prepare().  raw needs this built first.
     payload: Optional[str] = field(default=None)
 
@@ -103,6 +104,8 @@ class Packet:
     send_count: int = field(repr=False, default=0, compare=False, hash=False)
     retry_count: int = field(repr=False, default=3, compare=False, hash=False)
     last_send_time: float = field(repr=False, default=0, compare=False, hash=False)
+    # Was the packet acked?
+    acked: bool = field(repr=False, default=False, compare=False, hash=False)
 
     # Do we allow this packet to be saved to send later?
     allow_delay: bool = field(repr=False, default=True, compare=False, hash=False)
@@ -110,11 +113,7 @@ class Packet:
     via: Optional[str] = field(default=None, compare=False, hash=False)
 
     def get(self, key: str, default: Optional[str] = None):
-        """Emulate a getter on a dict."""
-        if hasattr(self, key):
-            return getattr(self, key)
-        else:
-            return default
+        return getattr(self, key, default)
 
     @property
     def key(self) -> str:
@@ -135,10 +134,10 @@ class Packet:
         msg = self._filter_for_send(self.raw).rstrip("\n")
         return msg
 
-    def prepare(self) -> None:
+    def prepare(self, create_msg_number=False) -> None:
         """Do stuff here that is needed prior to sending over the air."""
         # now build the raw message for sending
-        if not self.msgNo:
+        if not self.msgNo and create_msg_number:
             self.msgNo = _init_msgNo()
         self._build_payload()
         self._build_raw()
@@ -146,12 +145,12 @@ class Packet:
     def _build_payload(self) -> None:
         """The payload is the non headers portion of the packet."""
         if not self.to_call:
-            raise ValueError("to_call isn't set. Must set to_call before calling prepare()")
+            raise ValueError(
+                "to_call isn't set. Must set to_call before calling prepare()"
+            )
 
         # The base packet class has no real payload
-        self.payload = (
-            f":{self.to_call.ljust(9)}"
-        )
+        self.payload = f":{self.to_call.ljust(9)}"
 
     def _build_raw(self) -> None:
         """Build the self.raw which is what is sent over the air."""
@@ -172,8 +171,10 @@ class Packet:
         message = msg[:67]
         # We all miss George Carlin
         return re.sub(
-            "fuck|shit|cunt|piss|cock|bitch", "****",
-            message, flags=re.IGNORECASE,
+            "fuck|shit|cunt|piss|cock|bitch",
+            "****",
+            message,
+            flags=re.IGNORECASE,
         )
 
     def __str__(self) -> str:
@@ -220,10 +221,7 @@ class BulletinPacket(Packet):
         return f"BLN{self.bid} {self.message_text}"
 
     def _build_payload(self) -> None:
-        self.payload = (
-            f":BLN{self.bid:<9}"
-            f":{self.message_text}"
-        )
+        self.payload = f":BLN{self.bid:<9}" f":{self.message_text}"
 
 
 @dataclass_json
@@ -252,11 +250,17 @@ class MessagePacket(Packet):
         return self._filter_for_send(self.message_text).rstrip("\n")
 
     def _build_payload(self):
-        self.payload = ":{}:{}{{{}".format(
-            self.to_call.ljust(9),
-            self._filter_for_send(self.message_text).rstrip("\n"),
-            str(self.msgNo),
-        )
+        if self.msgNo:
+            self.payload = ":{}:{}{{{}".format(
+                self.to_call.ljust(9),
+                self._filter_for_send(self.message_text).rstrip("\n"),
+                str(self.msgNo),
+            )
+        else:
+            self.payload = ":{}:{}".format(
+                self.to_call.ljust(9),
+                self._filter_for_send(self.message_text).rstrip("\n"),
+            )
 
 
 @dataclass_json
@@ -335,10 +339,7 @@ class GPSPacket(Packet):
         self.payload = "".join(payload)
 
     def _build_raw(self):
-        self.raw = (
-            f"{self.from_call}>{self.to_call},WIDE2-1:"
-            f"{self.payload}"
-        )
+        self.raw = f"{self.from_call}>{self.to_call},WIDE2-1:" f"{self.payload}"
 
     @property
     def human_info(self) -> str:
@@ -370,10 +371,7 @@ class BeaconPacket(GPSPacket):
         lat = aprslib_util.latitude_to_ddm(self.latitude)
         lon = aprslib_util.longitude_to_ddm(self.longitude)
 
-        self.payload = (
-            f"@{time_zulu}z{lat}{self.symbol_table}"
-            f"{lon}"
-        )
+        self.payload = f"@{time_zulu}z{lat}{self.symbol_table}" f"{lon}"
 
         if self.comment:
             comment = self._filter_for_send(self.comment)
@@ -382,10 +380,7 @@ class BeaconPacket(GPSPacket):
             self.payload = f"{self.payload}{self.symbol}APRSD Beacon"
 
     def _build_raw(self):
-        self.raw = (
-            f"{self.from_call}>APZ100:"
-            f"{self.payload}"
-        )
+        self.raw = f"{self.from_call}>APZ100:" f"{self.payload}"
 
     @property
     def key(self) -> str:
@@ -393,7 +388,7 @@ class BeaconPacket(GPSPacket):
         if self.raw_timestamp:
             return f"{self.from_call}:{self.raw_timestamp}"
         else:
-            return f"{self.from_call}:{self.human_info.replace(' ','')}"
+            return f"{self.from_call}:{self.human_info.replace(' ', '')}"
 
     @property
     def human_info(self) -> str:
@@ -449,7 +444,7 @@ class TelemetryPacket(GPSPacket):
         if self.raw_timestamp:
             return f"{self.from_call}:{self.raw_timestamp}"
         else:
-            return f"{self.from_call}:{self.human_info.replace(' ','')}"
+            return f"{self.from_call}:{self.human_info.replace(' ', '')}"
 
     @property
     def human_info(self) -> str:
@@ -474,10 +469,7 @@ class ObjectPacket(GPSPacket):
         lat = aprslib_util.latitude_to_ddm(self.latitude)
         long = aprslib_util.longitude_to_ddm(self.longitude)
 
-        self.payload = (
-            f"*{time_zulu}z{lat}{self.symbol_table}"
-            f"{long}{self.symbol}"
-        )
+        self.payload = f"*{time_zulu}z{lat}{self.symbol_table}" f"{long}{self.symbol}"
 
         if self.comment:
             comment = self._filter_for_send(self.comment)
@@ -494,10 +486,7 @@ class ObjectPacket(GPSPacket):
         The frequency, uplink_tone, offset is part of the comment
         """
 
-        self.raw = (
-            f"{self.from_call}>APZ100:;{self.to_call:9s}"
-            f"{self.payload}"
-        )
+        self.raw = f"{self.from_call}>APZ100:;{self.to_call:9s}" f"{self.payload}"
 
     @property
     def human_info(self) -> str:
@@ -547,11 +536,13 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
             if "speed" in raw:
                 del raw["speed"]
             # Let's adjust the rain numbers as well, since it's wrong
-            raw["rain_1h"] = round((raw.get("rain_1h", 0) / .254) * .01, 3)
+            raw["rain_1h"] = round((raw.get("rain_1h", 0) / 0.254) * 0.01, 3)
             raw["weather"]["rain_1h"] = raw["rain_1h"]
-            raw["rain_24h"] = round((raw.get("rain_24h", 0) / .254) * .01, 3)
+            raw["rain_24h"] = round((raw.get("rain_24h", 0) / 0.254) * 0.01, 3)
             raw["weather"]["rain_24h"] = raw["rain_24h"]
-            raw["rain_since_midnight"] = round((raw.get("rain_since_midnight", 0) / .254) * .01, 3)
+            raw["rain_since_midnight"] = round(
+                (raw.get("rain_since_midnight", 0) / 0.254) * 0.01, 3
+            )
             raw["weather"]["rain_since_midnight"] = raw["rain_since_midnight"]
 
         if "wind_direction" not in raw:
@@ -593,26 +584,26 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
     def _build_payload(self):
         """Build an uncompressed weather packet
 
-        Format =
+         Format =
 
-       _CSE/SPDgXXXtXXXrXXXpXXXPXXXhXXbXXXXX%type NEW FORMAT APRS793 June 97
-                                                  NOT BACKWARD COMPATIBLE
+        _CSE/SPDgXXXtXXXrXXXpXXXPXXXhXXbXXXXX%type NEW FORMAT APRS793 June 97
+                                                   NOT BACKWARD COMPATIBLE
 
 
-        Where: CSE/SPD is wind direction and sustained 1 minute speed
-        t is in degrees F
+         Where: CSE/SPD is wind direction and sustained 1 minute speed
+         t is in degrees F
 
-        r is Rain per last 60 minutes
-            1.04 inches of rain will show as r104
-        p is precipitation per last 24 hours (sliding 24 hour window)
-        P is precip per last 24 hours since midnight
-        b is Baro in tenths of a mb
-        h is humidity in percent. 00=100
-        g is Gust (peak winds in last 5 minutes)
-        # is the raw rain counter for remote WX stations
-        See notes on remotes below
-        % shows software type d=Dos, m=Mac, w=Win, etc
-        type shows type of WX instrument
+         r is Rain per last 60 minutes
+             1.04 inches of rain will show as r104
+         p is precipitation per last 24 hours (sliding 24 hour window)
+         P is precip per last 24 hours since midnight
+         b is Baro in tenths of a mb
+         h is humidity in percent. 00=100
+         g is Gust (peak winds in last 5 minutes)
+         # is the raw rain counter for remote WX stations
+         See notes on remotes below
+         % shows software type d=Dos, m=Mac, w=Win, etc
+         type shows type of WX instrument
 
         """
         time_zulu = self._build_time_zulu()
@@ -622,17 +613,18 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
             f"{self.longitude}{self.symbol}",
             f"{self.wind_direction:03d}",
             # Speed = sustained 1 minute wind speed in mph
-            f"{self.symbol_table}", f"{self.wind_speed:03.0f}",
+            f"{self.symbol_table}",
+            f"{self.wind_speed:03.0f}",
             # wind gust (peak wind speed in mph in the last 5 minutes)
             f"g{self.wind_gust:03.0f}",
             # Temperature in degrees F
             f"t{self.temperature:03.0f}",
             # Rainfall (in hundredths of an inch) in the last hour
-            f"r{self.rain_1h*100:03.0f}",
+            f"r{self.rain_1h * 100:03.0f}",
             # Rainfall (in hundredths of an inch) in last 24 hours
-            f"p{self.rain_24h*100:03.0f}",
+            f"p{self.rain_24h * 100:03.0f}",
             # Rainfall (in hundredths of an inch) since midnigt
-            f"P{self.rain_since_midnight*100:03.0f}",
+            f"P{self.rain_since_midnight * 100:03.0f}",
             # Humidity
             f"h{self.humidity:02d}",
             # Barometric pressure (in tenths of millibars/tenths of hPascal)
@@ -644,11 +636,7 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
         self.payload = "".join(contents)
 
     def _build_raw(self):
-
-        self.raw = (
-            f"{self.from_call}>{self.to_call},WIDE1-1,WIDE2-1:"
-            f"{self.payload}"
-        )
+        self.raw = f"{self.from_call}>{self.to_call},WIDE1-1,WIDE2-1:" f"{self.payload}"
 
 
 @dataclass(unsafe_hash=True)
@@ -692,14 +680,17 @@ class UnknownPacket:
 
     All of the unknown attributes are stored in the unknown_fields
     """
+
     unknown_fields: CatchAll
     _type: str = "UnknownPacket"
     from_call: Optional[str] = field(default=None)
     to_call: Optional[str] = field(default=None)
-    msgNo: str = field(default_factory=_init_msgNo)   # noqa: N815
+    msgNo: str = field(default_factory=_init_msgNo)  # noqa: N815
     format: Optional[str] = field(default=None)
     raw: Optional[str] = field(default=None)
-    raw_dict: dict = field(repr=False, default_factory=lambda: {}, compare=False, hash=False)
+    raw_dict: dict = field(
+        repr=False, default_factory=lambda: {}, compare=False, hash=False
+    )
     path: List[str] = field(default_factory=list, compare=False, hash=False)
     packet_type: Optional[str] = field(default=None)
     via: Optional[str] = field(default=None, compare=False, hash=False)

aprsd/packets/log.py

@@ -1,14 +1,13 @@
 import logging
 from typing import Optional
 
-from geopy.distance import geodesic
+from haversine import Unit, haversine
 from loguru import logger
 from oslo_config import cfg
 
 from aprsd import utils
 from aprsd.packets.core import AckPacket, GPSPacket, RejectPacket
 
-
 LOG = logging.getLogger()
 LOGU = logger
 CONF = cfg.CONF
@@ -22,7 +21,9 @@ DISTANCE_COLOR = "fg #FF5733"
 DEGREES_COLOR = "fg #FFA900"
 
 
-def log_multiline(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> None:
+def log_multiline(
+    packet, tx: Optional[bool] = False, header: Optional[bool] = True
+) -> None:
     """LOG a packet to the logfile."""
     if not CONF.enable_packet_logging:
         return
@@ -121,8 +122,7 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
         via_color = "green"
         arrow = f"<{via_color}>-></{via_color}>"
         logit.append(
-            f"<cyan>{name}</cyan>"
-            f":{packet.msgNo}",
+            f"<cyan>{name}</cyan>" f":{packet.msgNo}",
         )
 
     tmp = None
@@ -145,8 +145,8 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
 
     # is there distance information?
     if isinstance(packet, GPSPacket) and CONF.latitude and CONF.longitude:
-        my_coords = (CONF.latitude, CONF.longitude)
-        packet_coords = (packet.latitude, packet.longitude)
+        my_coords = (float(CONF.latitude), float(CONF.longitude))
+        packet_coords = (float(packet.latitude), float(packet.longitude))
         try:
             bearing = utils.calculate_initial_compass_bearing(my_coords, packet_coords)
         except Exception as e:
@@ -154,7 +154,7 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
             bearing = 0
         logit.append(
             f" : <{DEGREES_COLOR}>{utils.degrees_to_cardinal(bearing, full_string=True)}</{DEGREES_COLOR}>"
-            f"<{DISTANCE_COLOR}>@{geodesic(my_coords, packet_coords).miles:.2f}miles</{DISTANCE_COLOR}>",
+            f"<{DISTANCE_COLOR}>@{haversine(my_coords, packet_coords, unit=Unit.MILES):.2f}miles</{DISTANCE_COLOR}>",
         )
 
     LOGU.opt(colors=True).info(" ".join(logit))