aprsd 4.1.1__py3-none-any.whl → 4.2.0__py3-none-any.whl

aprsd/packets/log.py

@@ -12,13 +12,13 @@ LOG = logging.getLogger()
 LOGU = logger
 CONF = cfg.CONF
 
-FROM_COLOR = "fg #C70039"
-TO_COLOR = "fg #D033FF"
-TX_COLOR = "red"
-RX_COLOR = "green"
-PACKET_COLOR = "cyan"
-DISTANCE_COLOR = "fg #FF5733"
-DEGREES_COLOR = "fg #FFA900"
+FROM_COLOR = 'fg #C70039'
+TO_COLOR = 'fg #D033FF'
+TX_COLOR = 'red'
+RX_COLOR = 'green'
+PACKET_COLOR = 'cyan'
+DISTANCE_COLOR = 'fg #FF5733'
+DEGREES_COLOR = 'fg #FFA900'
 
 
 def log_multiline(
@@ -27,11 +27,11 @@ def log_multiline(
     """LOG a packet to the logfile."""
     if not CONF.enable_packet_logging:
         return
-    if CONF.log_packet_format == "compact":
+    if CONF.log_packet_format == 'compact':
         return
 
     # asdict(packet)
-    logit = ["\n"]
+    logit = ['\n']
     name = packet.__class__.__name__
 
     if isinstance(packet, AckPacket):
@@ -41,57 +41,67 @@ def log_multiline(
 
     if header:
         if tx:
-            header_str = f"<{TX_COLOR}>TX</{TX_COLOR}>"
+            header_str = f'<{TX_COLOR}>TX</{TX_COLOR}>'
             logit.append(
-                f"{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>  "
-                f"TX:{packet.send_count + 1} of {pkt_max_send_count}",
+                f'{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>  '
+                f'TX:{packet.send_count + 1} of {pkt_max_send_count}',
             )
         else:
-            header_str = f"<{RX_COLOR}>RX</{RX_COLOR}>"
+            header_str = f'<{RX_COLOR}>RX</{RX_COLOR}>'
             logit.append(
-                f"{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)",
+                f'{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)',
             )
 
     else:
-        header_str = ""
-        logit.append(f"__________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)")
+        header_str = ''
+        logit.append(f'__________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)')
     # log_list.append(f"  Packet  : {packet.__class__.__name__}")
     if packet.msgNo:
-        logit.append(f"  Msg #   : {packet.msgNo}")
+        logit.append(f'  Msg #   : {packet.msgNo}')
     if packet.from_call:
-        logit.append(f"  From    : <{FROM_COLOR}>{packet.from_call}</{FROM_COLOR}>")
+        logit.append(f'  From    : <{FROM_COLOR}>{packet.from_call}</{FROM_COLOR}>')
     if packet.to_call:
-        logit.append(f"  To      : <{TO_COLOR}>{packet.to_call}</{TO_COLOR}>")
-    if hasattr(packet, "path") and packet.path:
-        logit.append(f"  Path    : {'=>'.join(packet.path)}")
-    if hasattr(packet, "via") and packet.via:
-        logit.append(f"  VIA     : {packet.via}")
+        logit.append(f'  To      : <{TO_COLOR}>{packet.to_call}</{TO_COLOR}>')
+    if hasattr(packet, 'path') and packet.path:
+        logit.append(f'  Path    : {"=>".join(packet.path)}')
+    if hasattr(packet, 'via') and packet.via:
+        logit.append(f'  VIA     : {packet.via}')
 
     if not isinstance(packet, AckPacket) and not isinstance(packet, RejectPacket):
         msg = packet.human_info
 
         if msg:
-            msg = msg.replace("<", "\\<")
-            logit.append(f"  Info    : <light-yellow><b>{msg}</b></light-yellow>")
+            msg = msg.replace('<', '\\<')
+            logit.append(f'  Info    : <light-yellow><b>{msg}</b></light-yellow>')
 
-    if hasattr(packet, "comment") and packet.comment:
-        logit.append(f"  Comment : {packet.comment}")
+    if hasattr(packet, 'comment') and packet.comment:
+        logit.append(f'  Comment : {packet.comment}')
 
-    raw = packet.raw.replace("<", "\\<")
-    logit.append(f"  Raw     : <fg #828282>{raw}</fg #828282>")
-    logit.append(f"{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)")
+    raw = packet.raw.replace('<', '\\<')
+    logit.append(f'  Raw     : <fg #828282>{raw}</fg #828282>')
+    logit.append(f'{header_str}________(<{PACKET_COLOR}>{name}</{PACKET_COLOR}>)')
 
-    LOGU.opt(colors=True).info("\n".join(logit))
+    LOGU.opt(colors=True).info('\n'.join(logit))
     LOG.debug(repr(packet))
 
 
-def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> None:
+def log(
+    packet,
+    tx: Optional[bool] = False,
+    header: Optional[bool] = True,
+    packet_count: Optional[int] = None,
+) -> None:
     if not CONF.enable_packet_logging:
         return
-    if CONF.log_packet_format == "multiline":
+    if CONF.log_packet_format == 'multiline':
         log_multiline(packet, tx, header)
         return
 
+    if not packet_count:
+        packet_count = ''
+    else:
+        packet_count = f'({packet_count:d})'
+
     logit = []
     name = packet.__class__.__name__
     if isinstance(packet, AckPacket):
@@ -101,47 +111,47 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
 
     if header:
         if tx:
-            via_color = "red"
-            arrow = f"<{via_color}>\u2192</{via_color}>"
+            via_color = 'red'
+            arrow = f'<{via_color}>\u2192</{via_color}>'
             logit.append(
-                f"<red>TX\u2191</red> "
-                f"<cyan>{name}</cyan>"
-                f":{packet.msgNo}"
-                f" ({packet.send_count + 1} of {pkt_max_send_count})",
+                f'<red>TX{packet_count}\u2191</red> '
+                f'<cyan>{name}</cyan>'
+                f':{packet.msgNo}'
+                f' ({packet.send_count + 1} of {pkt_max_send_count})',
             )
         else:
-            via_color = "fg #1AA730"
-            arrow = f"<{via_color}>\u2192</{via_color}>"
-            f"<{via_color}><-</{via_color}>"
+            via_color = 'fg #1AA730'
+            arrow = f'<{via_color}>\u2192</{via_color}>'
+            f'<{via_color}><-</{via_color}>'
             logit.append(
-                f"<fg #1AA730>RX\u2193</fg #1AA730> "
-                f"<cyan>{name}</cyan>"
-                f":{packet.msgNo}",
+                f'<fg #1AA730>RX{packet_count}\u2193</fg #1AA730> '
+                f'<cyan>{name}</cyan>'
+                f':{packet.msgNo}',
             )
     else:
-        via_color = "green"
-        arrow = f"<{via_color}>-></{via_color}>"
+        via_color = 'green'
+        arrow = f'<{via_color}>-></{via_color}>'
         logit.append(
-            f"<cyan>{name}</cyan>" f":{packet.msgNo}",
+            f'<cyan>{name}</cyan>:{packet.msgNo}',
         )
 
     tmp = None
     if packet.path:
-        tmp = f"{arrow}".join(packet.path) + f"{arrow} "
+        tmp = f'{arrow}'.join(packet.path) + f'{arrow} '
 
     logit.append(
-        f"<{FROM_COLOR}>{packet.from_call}</{FROM_COLOR}> {arrow}"
-        f"{tmp if tmp else ' '}"
-        f"<{TO_COLOR}>{packet.to_call}</{TO_COLOR}>",
+        f'<{FROM_COLOR}>{packet.from_call}</{FROM_COLOR}> {arrow}'
+        f'{tmp if tmp else " "}'
+        f'<{TO_COLOR}>{packet.to_call}</{TO_COLOR}>',
     )
 
     if not isinstance(packet, AckPacket) and not isinstance(packet, RejectPacket):
-        logit.append(":")
+        logit.append(':')
         msg = packet.human_info
 
         if msg:
-            msg = msg.replace("<", "\\<")
-            logit.append(f"<light-yellow><b>{msg}</b></light-yellow>")
+            msg = msg.replace('<', '\\<')
+            logit.append(f'<light-yellow><b>{msg}</b></light-yellow>')
 
     # is there distance information?
     if isinstance(packet, GPSPacket) and CONF.latitude and CONF.longitude:
@@ -150,12 +160,12 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
         try:
             bearing = utils.calculate_initial_compass_bearing(my_coords, packet_coords)
         except Exception as e:
-            LOG.error(f"Failed to calculate bearing: {e}")
+            LOG.error(f'Failed to calculate bearing: {e}')
             bearing = 0
         logit.append(
-            f" : <{DEGREES_COLOR}>{utils.degrees_to_cardinal(bearing, full_string=True)}</{DEGREES_COLOR}>"
-            f"<{DISTANCE_COLOR}>@{haversine(my_coords, packet_coords, unit=Unit.MILES):.2f}miles</{DISTANCE_COLOR}>",
+            f' : <{DEGREES_COLOR}>{utils.degrees_to_cardinal(bearing, full_string=True)}</{DEGREES_COLOR}>'
+            f'<{DISTANCE_COLOR}>@{haversine(my_coords, packet_coords, unit=Unit.MILES):.2f}miles</{DISTANCE_COLOR}>',
         )
 
-    LOGU.opt(colors=True).info(" ".join(logit))
+    LOGU.opt(colors=True).info(' '.join(logit))
     log_multiline(packet, tx, header)

aprsd/plugin.py

@@ -12,7 +12,8 @@ import pluggy
 from oslo_config import cfg
 
 import aprsd
-from aprsd import client, packets, threads
+from aprsd import packets, threads
+from aprsd.client.client import APRSDClient
 from aprsd.packets import watch_list
 
 # setup the global logger
@@ -146,7 +147,7 @@ class APRSDWatchListPluginBase(APRSDPluginBase, metaclass=abc.ABCMeta):
             watch_list = CONF.watch_list.callsigns
             # make sure the timeout is set or this doesn't work
             if watch_list:
-                aprs_client = client.client_factory.create().client
+                aprs_client = APRSDClient()
                 filter_str = 'b/{}'.format('/'.join(watch_list))
                 aprs_client.set_filter(filter_str)
             else:

aprsd/plugin_utils.py

@@ -66,8 +66,8 @@ def fetch_openweathermap(api_key, lat, lon, units='metric', exclude=None):
         exclude = 'minutely,hourly,daily,alerts'
     try:
         url = (
-            'https://api.openweathermap.org/data/2.5/onecall?'
-            'lat={}&lon={}&appid={}&units={}&exclude={}'.format(
+            "https://api.openweathermap.org/data/3.0/onecall?"
+            "lat={}&lon={}&appid={}&units={}&exclude={}".format(
                 lat,
                 lon,
                 api_key,

aprsd/plugins/weather.py

@@ -323,8 +323,8 @@ class AVWXWeatherPlugin(plugin.APRSDRegexCommandPluginBase):
         elif not CONF.avwx_plugin.apiKey:
             LOG.error('Config avwx_plugin.apiKey not specified. Disabling')
             return False
-        else:
-            return True
+
+        self.enabled = True
 
     def help(self):
         _help = [

aprsd/stats/collector.py

@@ -3,7 +3,7 @@ from typing import Callable, Protocol, runtime_checkable
 
 from aprsd.utils import singleton
 
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 @runtime_checkable
@@ -31,15 +31,16 @@ class Collector:
                     serializable=serializable
                 ).copy()
             except Exception as e:
-                LOG.error(f"Error in producer {name} (stats): {e}")
+                LOG.error(f'Error in producer {name} (stats): {e}')
+                raise e
         return stats
 
     def register_producer(self, producer_name: Callable):
         if not isinstance(producer_name, StatsProducer):
-            raise TypeError(f"Producer {producer_name} is not a StatsProducer")
+            raise TypeError(f'Producer {producer_name} is not a StatsProducer')
         self.producers.append(producer_name)
 
     def unregister_producer(self, producer_name: Callable):
         if not isinstance(producer_name, StatsProducer):
-            raise TypeError(f"Producer {producer_name} is not a StatsProducer")
+            raise TypeError(f'Producer {producer_name} is not a StatsProducer')
         self.producers.remove(producer_name)

aprsd/threads/rx.py

@@ -7,7 +7,7 @@ import aprslib
 from oslo_config import cfg
 
 from aprsd import packets, plugin
-from aprsd.client import client_factory
+from aprsd.client.client import APRSDClient
 from aprsd.packets import collector, filter
 from aprsd.packets import log as packet_log
 from aprsd.threads import APRSDThread, tx
@@ -32,6 +32,8 @@ class APRSDRXThread(APRSDThread):
     # getting blocked by the APRS server trying to send us packets.
     packet_queue = None
 
+    pkt_count = 0
+
     def __init__(self, packet_queue):
         super().__init__('RX_PKT')
         self.packet_queue = packet_queue
@@ -39,16 +41,16 @@ class APRSDRXThread(APRSDThread):
     def stop(self):
         self.thread_stop = True
         if self._client:
-            self._client.stop()
+            self._client.close()
 
     def loop(self):
         if not self._client:
-            self._client = client_factory.create()
+            self._client = APRSDClient()
             time.sleep(1)
             return True
 
-        if not self._client.is_connected:
-            self._client = client_factory.create()
+        if not self._client.is_alive:
+            self._client = APRSDClient()
             time.sleep(1)
             return True
 
@@ -66,7 +68,6 @@ class APRSDRXThread(APRSDThread):
             self._client.consumer(
                 self.process_packet,
                 raw=False,
-                blocking=False,
             )
         except (
             aprslib.exceptions.ConnectionDrop,
@@ -78,8 +79,8 @@ class APRSDRXThread(APRSDThread):
             # is called
             self._client.reset()
             time.sleep(5)
-        except Exception:
-            # LOG.exception(ex)
+        except Exception as ex:
+            LOG.exception(ex)
             LOG.error('Resetting connection and trying again.')
             self._client.reset()
             time.sleep(5)
@@ -92,7 +93,8 @@ class APRSDRXThread(APRSDThread):
                 'No packet received from decode_packet.  Most likely a failure to parse'
             )
             return
-        packet_log.log(packet)
+        self.pkt_count += 1
+        packet_log.log(packet, packet_count=self.pkt_count)
         pkt_list = packets.PacketList()
 
         if isinstance(packet, packets.AckPacket):
@@ -216,7 +218,7 @@ class APRSDProcessPacketThread(APRSDFilterThread):
         our_call = CONF.callsign.lower()
 
         from_call = packet.from_call
-        if packet.addresse:
+        if hasattr(packet, 'addresse') and packet.addresse:
             to_call = packet.addresse
         else:
             to_call = packet.to_call

aprsd/threads/tx.py

@@ -11,12 +11,12 @@ from rush.stores import dictionary
 
 from aprsd import conf  # noqa
 from aprsd import threads as aprsd_threads
-from aprsd.client import client_factory
+from aprsd.client.client import APRSDClient
 from aprsd.packets import collector, core, tracker
 from aprsd.packets import log as packet_log
 
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 msg_t = throttle.Throttle(
     limiter=periodic.PeriodicLimiter(
@@ -54,7 +54,7 @@ def send(packet: core.Packet, direct=False, aprs_client=None):
         if CONF.enable_sending_ack_packets:
             _send_ack(packet, direct=direct, aprs_client=aprs_client)
         else:
-            LOG.info("Sending ack packets is disabled. Not sending AckPacket.")
+            LOG.info('Sending ack packets is disabled. Not sending AckPacket.')
     else:
         _send_packet(packet, direct=direct, aprs_client=aprs_client)
 
@@ -81,14 +81,14 @@ def _send_direct(packet, aprs_client=None):
     if aprs_client:
         cl = aprs_client
     else:
-        cl = client_factory.create()
+        cl = APRSDClient()
 
     packet.update_timestamp()
     packet_log.log(packet, tx=True)
     try:
         cl.send(packet)
     except Exception as e:
-        LOG.error(f"Failed to send packet: {packet}")
+        LOG.error(f'Failed to send packet: {packet}')
         LOG.error(e)
         return False
     else:
@@ -100,7 +100,7 @@ class SendPacketThread(aprsd_threads.APRSDThread):
 
     def __init__(self, packet):
         self.packet = packet
-        super().__init__(f"TX-{packet.to_call}-{self.packet.msgNo}")
+        super().__init__(f'TX-{packet.to_call}-{self.packet.msgNo}')
 
     def loop(self):
         """Loop until a message is acked or it gets delayed.
@@ -119,9 +119,9 @@ class SendPacketThread(aprsd_threads.APRSDThread):
             # The message has been removed from the tracking queue
             # So it got acked and we are done.
             LOG.info(
-                f"{self.packet.__class__.__name__}"
-                f"({self.packet.msgNo}) "
-                "Message Send Complete via Ack.",
+                f'{self.packet.__class__.__name__}'
+                f'({self.packet.msgNo}) '
+                'Message Send Complete via Ack.',
             )
             return False
         else:
@@ -130,10 +130,10 @@ class SendPacketThread(aprsd_threads.APRSDThread):
                 # we reached the send limit, don't send again
                 # TODO(hemna) - Need to put this in a delayed queue?
                 LOG.info(
-                    f"{packet.__class__.__name__} "
-                    f"({packet.msgNo}) "
-                    "Message Send Complete. Max attempts reached"
-                    f" {packet.retry_count}",
+                    f'{packet.__class__.__name__} '
+                    f'({packet.msgNo}) '
+                    'Message Send Complete. Max attempts reached'
+                    f' {packet.retry_count}',
                 )
                 pkt_tracker.remove(packet.msgNo)
                 return False
@@ -157,8 +157,9 @@ class SendPacketThread(aprsd_threads.APRSDThread):
                 sent = False
                 try:
                     sent = _send_direct(packet)
-                except Exception:
-                    LOG.error(f"Failed to send packet: {packet}")
+                except Exception as ex:
+                    LOG.error(f'Failed to send packet: {packet}')
+                    LOG.error(ex)
                 else:
                     # If an exception happens while sending
                     # we don't want this attempt to count
@@ -178,7 +179,7 @@ class SendAckThread(aprsd_threads.APRSDThread):
 
     def __init__(self, packet):
         self.packet = packet
-        super().__init__(f"TXAck-{packet.to_call}-{self.packet.msgNo}")
+        super().__init__(f'TXAck-{packet.to_call}-{self.packet.msgNo}')
         self.max_retries = CONF.default_ack_send_count
 
     def loop(self):
@@ -188,10 +189,10 @@ class SendAckThread(aprsd_threads.APRSDThread):
             # we reached the send limit, don't send again
             # TODO(hemna) - Need to put this in a delayed queue?
             LOG.debug(
-                f"{self.packet.__class__.__name__}"
-                f"({self.packet.msgNo}) "
-                "Send Complete. Max attempts reached"
-                f" {self.max_retries}",
+                f'{self.packet.__class__.__name__}'
+                f'({self.packet.msgNo}) '
+                'Send Complete. Max attempts reached'
+                f' {self.max_retries}',
             )
             return False
 
@@ -207,7 +208,7 @@ class SendAckThread(aprsd_threads.APRSDThread):
                 # It's time to try to send it again
                 send_now = True
             elif self.loop_count % 10 == 0:
-                LOG.debug(f"Still wating. {delta}")
+                LOG.debug(f'Still wating. {delta}')
         else:
             send_now = True
 
@@ -216,7 +217,7 @@ class SendAckThread(aprsd_threads.APRSDThread):
             try:
                 sent = _send_direct(self.packet)
             except Exception:
-                LOG.error(f"Failed to send packet: {self.packet}")
+                LOG.error(f'Failed to send packet: {self.packet}')
             else:
                 # If an exception happens while sending
                 # we don't want this attempt to count
@@ -240,18 +241,18 @@ class BeaconSendThread(aprsd_threads.APRSDThread):
     _loop_cnt: int = 1
 
     def __init__(self):
-        super().__init__("BeaconSendThread")
+        super().__init__('BeaconSendThread')
         self._loop_cnt = 1
         # Make sure Latitude and Longitude are set.
         if not CONF.latitude or not CONF.longitude:
             LOG.error(
-                "Latitude and Longitude are not set in the config file."
-                "Beacon will not be sent and thread is STOPPED.",
+                'Latitude and Longitude are not set in the config file.'
+                'Beacon will not be sent and thread is STOPPED.',
             )
             self.stop()
         LOG.info(
-            "Beacon thread is running and will send "
-            f"beacons every {CONF.beacon_interval} seconds.",
+            'Beacon thread is running and will send '
+            f'beacons every {CONF.beacon_interval} seconds.',
         )
 
     def loop(self):
@@ -259,10 +260,10 @@ class BeaconSendThread(aprsd_threads.APRSDThread):
         if self._loop_cnt % CONF.beacon_interval == 0:
             pkt = core.BeaconPacket(
                 from_call=CONF.callsign,
-                to_call="APRS",
+                to_call='APRS',
                 latitude=float(CONF.latitude),
                 longitude=float(CONF.longitude),
-                comment="APRSD GPS Beacon",
+                comment='APRSD GPS Beacon',
                 symbol=CONF.beacon_symbol,
             )
             try:
@@ -270,8 +271,8 @@ class BeaconSendThread(aprsd_threads.APRSDThread):
                 pkt.retry_count = 1
                 send(pkt, direct=True)
             except Exception as e:
-                LOG.error(f"Failed to send beacon: {e}")
-                client_factory.create().reset()
+                LOG.error(f'Failed to send beacon: {e}')
+                APRSDClient().reset()
                 time.sleep(5)
 
         self._loop_cnt += 1

aprsd/utils/keepalive_collector.py

@@ -3,7 +3,7 @@ from typing import Callable, Protocol, runtime_checkable
 
 from aprsd.utils import singleton
 
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 @runtime_checkable
@@ -33,7 +33,8 @@ class KeepAliveCollector:
             try:
                 cls.keepalive_check()
             except Exception as e:
-                LOG.error(f"Error in producer {name} (check): {e}")
+                LOG.error(f'Error in producer {name} (check): {e}')
+                raise e
 
     def log(self) -> None:
         """Log any relevant information during a KeepAlive check"""
@@ -42,14 +43,15 @@ class KeepAliveCollector:
             try:
                 cls.keepalive_log()
             except Exception as e:
-                LOG.error(f"Error in producer {name} (check): {e}")
+                LOG.error(f'Error in producer {name} (check): {e}')
+                raise e
 
     def register(self, producer_name: Callable):
         if not isinstance(producer_name, KeepAliveProducer):
-            raise TypeError(f"Producer {producer_name} is not a KeepAliveProducer")
+            raise TypeError(f'Producer {producer_name} is not a KeepAliveProducer')
         self.producers.append(producer_name)
 
     def unregister(self, producer_name: Callable):
         if not isinstance(producer_name, KeepAliveProducer):
-            raise TypeError(f"Producer {producer_name} is not a KeepAliveProducer")
+            raise TypeError(f'Producer {producer_name} is not a KeepAliveProducer')
         self.producers.remove(producer_name)