aprsd 4.1.0__tar.gz → 4.1.1__tar.gz

{aprsd-4.1.0 → aprsd-4.1.1}/ChangeLog.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [4.1.1](https://github.com/craigerl/aprsd/compare/4.1.0...4.1.1)
+
+> 5 March 2025
+
+- Added new config to disable logging to console [`0fa5b07`](https://github.com/craigerl/aprsd/commit/0fa5b07d4bf4bc5d5aaad1de52b78058e472fe24)
+- Added threads.service [`c1c89fd`](https://github.com/craigerl/aprsd/commit/c1c89fd2c2c69c5e6c5d29a736a7b89e3d45cfe2)
+- Update requirements [`2b185ee`](https://github.com/craigerl/aprsd/commit/2b185ee1b84598c832d8a5d73753cb428854b932)
+- Fixed some more ruff checks [`94ba915`](https://github.com/craigerl/aprsd/commit/94ba915ed44b11eaabc885e033669d67d8c341a5)
+
 #### [4.1.0](https://github.com/craigerl/aprsd/compare/4.0.2...4.1.0)
 
 > 20 February 2025
@@ -21,6 +30,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix for None packet in rx thread [`d82a81a`](https://github.com/craigerl/aprsd/commit/d82a81a2c3c1a7f50177a0a6435a555daeb858aa)
 - Fix runaway KISS driver on failed connnection [`b6da0eb`](https://github.com/craigerl/aprsd/commit/b6da0ebb0d2f4d7078dbbf91d8c03715412d89ea)
 - CONF.logging.enable_color option added [`06bdb34`](https://github.com/craigerl/aprsd/commit/06bdb34642640d91ea96e3c6e8d8b5a4b8230611)
+- Update Changelog for 4.1.0 release [`a3cda9f`](https://github.com/craigerl/aprsd/commit/a3cda9f37d4c9b955b523f46b2eb8cf412a84407)
 
 #### [4.0.2](https://github.com/craigerl/aprsd/compare/4.0.1...4.0.2)
 

{aprsd-4.1.0 → aprsd-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aprsd
-Version: 4.1.0
+Version: 4.1.1
 Summary: APRSd is a APRS-IS server that can be used to connect to APRS-IS and send and receive APRS packets.
 Author-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>, Emre Saglam <emresaglam@gmail.com>, Jason Martin <jhmartin@toger.us>, John <johng42@users.noreply.github.com>, Martiros Shakhzadyan <vrzh@vrzh.net>, Zoe Moore <zoenb@mailbox.org>, ranguli <hello@joshmurphy.ca>
 Maintainer-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>
@@ -202,13 +202,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: aprslib==0.7.2
-Requires-Dist: attrs==24.3.0
+Requires-Dist: attrs==25.1.0
 Requires-Dist: ax253==0.1.5.post1
-Requires-Dist: bitarray==3.0.0
-Requires-Dist: certifi==2024.12.14
+Requires-Dist: bitarray==3.1.0
+Requires-Dist: certifi==2025.1.31
 Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: click==8.1.8
-Requires-Dist: commonmark==0.9.1
 Requires-Dist: dataclasses-json==0.6.7
 Requires-Dist: debtcollector==3.0.0
 Requires-Dist: haversine==2.9.0
@@ -216,39 +215,42 @@ Requires-Dist: idna==3.10
 Requires-Dist: importlib-metadata==8.6.1
 Requires-Dist: kiss3==8.0.0
 Requires-Dist: loguru==0.7.3
-Requires-Dist: marshmallow==3.26.0
+Requires-Dist: markdown-it-py==3.0.0
+Requires-Dist: marshmallow==3.26.1
+Requires-Dist: mdurl==0.1.2
 Requires-Dist: mypy-extensions==1.0.0
 Requires-Dist: netaddr==1.3.0
-Requires-Dist: oslo-config==9.7.0
-Requires-Dist: oslo-i18n==6.5.0
+Requires-Dist: oslo-config==9.7.1
+Requires-Dist: oslo-i18n==6.5.1
 Requires-Dist: packaging==24.2
-Requires-Dist: pbr==6.1.0
+Requires-Dist: pbr==6.1.1
 Requires-Dist: pluggy==1.5.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: pyserial==3.5
 Requires-Dist: pyserial-asyncio==0.6
-Requires-Dist: pytz==2024.2
+Requires-Dist: pytz==2025.1
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rfc3986==2.0.0
-Requires-Dist: rich==12.6.0
+Requires-Dist: rich==13.9.4
 Requires-Dist: rush==2021.4.0
-Requires-Dist: stevedore==5.4.0
+Requires-Dist: setuptools==75.8.2
+Requires-Dist: stevedore==5.4.1
 Requires-Dist: thesmuggler==1.0.1
 Requires-Dist: timeago==1.0.16
 Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: typing-inspect==0.9.0
-Requires-Dist: tzlocal==5.2
+Requires-Dist: tzlocal==5.3
 Requires-Dist: update-checker==0.18.0
 Requires-Dist: urllib3==2.3.0
 Requires-Dist: wrapt==1.17.2
 Requires-Dist: zipp==3.21.0
 Provides-Extra: dev
 Requires-Dist: alabaster==1.0.0; extra == "dev"
-Requires-Dist: babel==2.16.0; extra == "dev"
+Requires-Dist: babel==2.17.0; extra == "dev"
 Requires-Dist: build==1.2.2.post1; extra == "dev"
-Requires-Dist: cachetools==5.5.1; extra == "dev"
-Requires-Dist: certifi==2024.12.14; extra == "dev"
+Requires-Dist: cachetools==5.5.2; extra == "dev"
+Requires-Dist: certifi==2025.1.31; extra == "dev"
 Requires-Dist: cfgv==3.4.0; extra == "dev"
 Requires-Dist: chardet==5.2.0; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.1; extra == "dev"
@@ -257,7 +259,7 @@ Requires-Dist: colorama==0.4.6; extra == "dev"
 Requires-Dist: distlib==0.3.9; extra == "dev"
 Requires-Dist: docutils==0.21.2; extra == "dev"
 Requires-Dist: filelock==3.17.0; extra == "dev"
-Requires-Dist: identify==2.6.6; extra == "dev"
+Requires-Dist: identify==2.6.8; extra == "dev"
 Requires-Dist: idna==3.10; extra == "dev"
 Requires-Dist: imagesize==1.4.1; extra == "dev"
 Requires-Dist: jinja2==3.1.5; extra == "dev"
@@ -266,7 +268,7 @@ Requires-Dist: markupsafe==3.0.2; extra == "dev"
 Requires-Dist: mistune==0.8.4; extra == "dev"
 Requires-Dist: nodeenv==1.9.1; extra == "dev"
 Requires-Dist: packaging==24.2; extra == "dev"
-Requires-Dist: pip==24.3.1; extra == "dev"
+Requires-Dist: pip==25.0.1; extra == "dev"
 Requires-Dist: pip-tools==7.4.1; extra == "dev"
 Requires-Dist: platformdirs==4.3.6; extra == "dev"
 Requires-Dist: pluggy==1.5.0; extra == "dev"
@@ -276,7 +278,7 @@ Requires-Dist: pyproject-api==1.9.0; extra == "dev"
 Requires-Dist: pyproject-hooks==1.2.0; extra == "dev"
 Requires-Dist: pyyaml==6.0.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: setuptools==75.8.0; extra == "dev"
+Requires-Dist: setuptools==75.8.2; extra == "dev"
 Requires-Dist: snowballstemmer==2.2.0; extra == "dev"
 Requires-Dist: sphinx==8.1.3; extra == "dev"
 Requires-Dist: sphinxcontrib-applehelp==2.0.0; extra == "dev"
@@ -289,7 +291,7 @@ Requires-Dist: tomli==2.2.1; extra == "dev"
 Requires-Dist: tox==4.24.1; extra == "dev"
 Requires-Dist: typing-extensions==4.12.2; extra == "dev"
 Requires-Dist: urllib3==2.3.0; extra == "dev"
-Requires-Dist: virtualenv==20.29.1; extra == "dev"
+Requires-Dist: virtualenv==20.29.2; extra == "dev"
 Requires-Dist: wheel==0.45.1; extra == "dev"
 
 # APRSD - Ham radio APRS-IS Message platform software

{aprsd-4.1.0 → aprsd-4.1.1}/aprsd/cli_helper.py

@@ -13,35 +13,35 @@ from aprsd.utils import trace
 
 CONF = cfg.CONF
 home = str(Path.home())
-DEFAULT_CONFIG_DIR = f"{home}/.config/aprsd/"
-DEFAULT_SAVE_FILE = f"{home}/.config/aprsd/aprsd.p"
-DEFAULT_CONFIG_FILE = f"{home}/.config/aprsd/aprsd.conf"
+DEFAULT_CONFIG_DIR = f'{home}/.config/aprsd/'
+DEFAULT_SAVE_FILE = f'{home}/.config/aprsd/aprsd.p'
+DEFAULT_CONFIG_FILE = f'{home}/.config/aprsd/aprsd.conf'
 
 
-F = t.TypeVar("F", bound=t.Callable[..., t.Any])
+F = t.TypeVar('F', bound=t.Callable[..., t.Any])
 
 common_options = [
     click.option(
-        "--loglevel",
-        default="INFO",
+        '--loglevel',
+        default='INFO',
         show_default=True,
         type=click.Choice(
-            ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"],
+            ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG'],
             case_sensitive=False,
         ),
         show_choices=True,
-        help="The log level to use for aprsd.log",
+        help='The log level to use for aprsd.log',
     ),
     click.option(
-        "-c",
-        "--config",
-        "config_file",
+        '-c',
+        '--config',
+        'config_file',
         show_default=True,
         default=DEFAULT_CONFIG_FILE,
-        help="The aprsd config file to use for options.",
+        help='The aprsd config file to use for options.',
     ),
     click.option(
-        "--quiet",
+        '--quiet',
         is_flag=True,
         default=False,
         help="Don't log to stdout",
@@ -59,7 +59,7 @@ class AliasedGroup(click.Group):
         """
 
         def decorator(f):
-            aliases = kwargs.pop("aliases", [])
+            aliases = kwargs.pop('aliases', [])
             cmd = click.decorators.command(*args, **kwargs)(f)
             self.add_command(cmd)
             for alias in aliases:
@@ -77,7 +77,7 @@ class AliasedGroup(click.Group):
         """
 
         def decorator(f):
-            aliases = kwargs.pop("aliases", [])
+            aliases = kwargs.pop('aliases', [])
             cmd = click.decorators.group(*args, **kwargs)(f)
             self.add_command(cmd)
             for alias in aliases:
@@ -101,36 +101,37 @@ def process_standard_options(f: F) -> F:
         ctx = args[0]
         ctx.ensure_object(dict)
         config_file_found = True
-        if kwargs["config_file"]:
-            default_config_files = [kwargs["config_file"]]
+        if kwargs['config_file']:
+            default_config_files = [kwargs['config_file']]
         else:
             default_config_files = None
+
         try:
             CONF(
                 [],
-                project="aprsd",
+                project='aprsd',
                 version=aprsd.__version__,
                 default_config_files=default_config_files,
             )
         except cfg.ConfigFilesNotFoundError:
             config_file_found = False
-        ctx.obj["loglevel"] = kwargs["loglevel"]
+        ctx.obj['loglevel'] = kwargs['loglevel']
         # ctx.obj["config_file"] = kwargs["config_file"]
-        ctx.obj["quiet"] = kwargs["quiet"]
+        ctx.obj['quiet'] = kwargs['quiet']
         log.setup_logging(
-            ctx.obj["loglevel"],
-            ctx.obj["quiet"],
+            ctx.obj['loglevel'],
+            ctx.obj['quiet'],
         )
         if CONF.trace_enabled:
-            trace.setup_tracing(["method", "api"])
+            trace.setup_tracing(['method', 'api'])
 
         if not config_file_found:
-            LOG = logging.getLogger("APRSD")  # noqa: N806
+            LOG = logging.getLogger('APRSD')  # noqa: N806
             LOG.error("No config file found!! run 'aprsd sample-config'")
 
-        del kwargs["loglevel"]
-        del kwargs["config_file"]
-        del kwargs["quiet"]
+        del kwargs['loglevel']
+        del kwargs['config_file']
+        del kwargs['quiet']
         return f(*args, **kwargs)
 
     return update_wrapper(t.cast(F, new_func), f)
@@ -142,17 +143,17 @@ def process_standard_options_no_config(f: F) -> F:
     def new_func(*args, **kwargs):
         ctx = args[0]
         ctx.ensure_object(dict)
-        ctx.obj["loglevel"] = kwargs["loglevel"]
-        ctx.obj["config_file"] = kwargs["config_file"]
-        ctx.obj["quiet"] = kwargs["quiet"]
+        ctx.obj['loglevel'] = kwargs['loglevel']
+        ctx.obj['config_file'] = kwargs['config_file']
+        ctx.obj['quiet'] = kwargs['quiet']
         log.setup_logging(
-            ctx.obj["loglevel"],
-            ctx.obj["quiet"],
+            ctx.obj['loglevel'],
+            ctx.obj['quiet'],
         )
 
-        del kwargs["loglevel"]
-        del kwargs["config_file"]
-        del kwargs["quiet"]
+        del kwargs['loglevel']
+        del kwargs['config_file']
+        del kwargs['quiet']
         return f(*args, **kwargs)
 
     return update_wrapper(t.cast(F, new_func), f)

{aprsd-4.1.0 → aprsd-4.1.1}/aprsd/client/base.py

@@ -9,7 +9,7 @@ from aprsd.packets import core
 from aprsd.utils import keepalive_collector
 
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 class APRSClient:
@@ -20,8 +20,8 @@ class APRSClient:
 
     connected = False
     login_status = {
-        "success": False,
-        "message": None,
+        'success': False,
+        'message': None,
     }
     filter = None
     lock = threading.Lock()
@@ -59,17 +59,20 @@ class APRSClient:
 
     @property
     def login_success(self):
-        return self.login_status.get("success", False)
+        return self.login_status.get('success', False)
 
     @property
     def login_failure(self):
-        return self.login_status["message"]
+        return self.login_status['message']
 
     def set_filter(self, filter):
         self.filter = filter
         if self._client:
             self._client.set_filter(filter)
 
+    def get_filter(self):
+        return self.filter
+
     @property
     def client(self):
         if not self._client:
@@ -80,16 +83,16 @@ class APRSClient:
         try:
             self._client = self.setup_connection()
             if self.filter:
-                LOG.info("Creating APRS client filter")
+                LOG.info('Creating APRS client filter')
                 self._client.set_filter(self.filter)
         except Exception as e:
-            LOG.error(f"Failed to create APRS client: {e}")
+            LOG.error(f'Failed to create APRS client: {e}')
             self._client = None
             raise
 
     def stop(self):
         if self._client:
-            LOG.info("Stopping client connection.")
+            LOG.info('Stopping client connection.')
             self._client.stop()
 
     def send(self, packet: core.Packet) -> None:
@@ -103,16 +106,16 @@ class APRSClient:
     @wrapt.synchronized(lock)
     def reset(self) -> None:
         """Call this to force a rebuild/reconnect."""
-        LOG.info("Resetting client connection.")
+        LOG.info('Resetting client connection.')
         if self._client:
             self._client.close()
             del self._client
             self._create_client()
         else:
-            LOG.warning("Client not initialized, nothing to reset.")
+            LOG.warning('Client not initialized, nothing to reset.')
 
         # Recreate the client
-        LOG.info(f"Creating new client {self.client}")
+        LOG.info(f'Creating new client {self.client}')
 
     @abc.abstractmethod
     def setup_connection(self):

{aprsd-4.1.0 → aprsd-4.1.1}/aprsd/cmds/send_message.py

@@ -3,58 +3,60 @@ import sys
 import time
 
 import aprslib
-from aprslib.exceptions import LoginError
 import click
+from aprslib.exceptions import LoginError
 from oslo_config import cfg
 
 import aprsd
-from aprsd import cli_helper, packets
-from aprsd import conf  # noqa : F401
+import aprsd.packets  # noqa : F401
+from aprsd import (
+    cli_helper,
+    conf,  # noqa : F401
+    packets,
+)
 from aprsd.client import client_factory
 from aprsd.main import cli
-import aprsd.packets  # noqa : F401
 from aprsd.packets import collector
 from aprsd.packets import log as packet_log
 from aprsd.threads import tx
 
-
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 @cli.command()
 @cli_helper.add_options(cli_helper.common_options)
 @click.option(
-    "--aprs-login",
-    envvar="APRS_LOGIN",
+    '--aprs-login',
+    envvar='APRS_LOGIN',
     show_envvar=True,
-    help="What callsign to send the message from. Defaults to config entry.",
+    help='What callsign to send the message from. Defaults to config entry.',
 )
 @click.option(
-    "--aprs-password",
-    envvar="APRS_PASSWORD",
+    '--aprs-password',
+    envvar='APRS_PASSWORD',
     show_envvar=True,
-    help="the APRS-IS password for APRS_LOGIN. Defaults to config entry.",
+    help='the APRS-IS password for APRS_LOGIN. Defaults to config entry.',
 )
 @click.option(
-    "--no-ack",
-    "-n",
+    '--no-ack',
+    '-n',
     is_flag=True,
     show_default=True,
     default=False,
     help="Don't wait for an ack, just sent it to APRS-IS and bail.",
 )
 @click.option(
-    "--wait-response",
-    "-w",
+    '--wait-response',
+    '-w',
     is_flag=True,
     show_default=True,
     default=False,
-    help="Wait for a response to the message?",
+    help='Wait for a response to the message?',
 )
-@click.option("--raw", default=None, help="Send a raw message.  Implies --no-ack")
-@click.argument("tocallsign", required=True)
-@click.argument("command", nargs=-1, required=True)
+@click.option('--raw', default=None, help='Send a raw message.  Implies --no-ack')
+@click.argument('tocallsign', required=True)
+@click.argument('command', nargs=-1, required=True)
 @click.pass_context
 @cli_helper.process_standard_options
 def send_message(
@@ -69,11 +71,11 @@ def send_message(
 ):
     """Send a message to a callsign via APRS_IS."""
     global got_ack, got_response
-    quiet = ctx.obj["quiet"]
+    quiet = ctx.obj['quiet']
 
     if not aprs_login:
         if CONF.aprs_network.login == conf.client.DEFAULT_LOGIN:
-            click.echo("Must set --aprs_login or APRS_LOGIN")
+            click.echo('Must set --aprs_login or APRS_LOGIN')
             ctx.exit(-1)
             return
         else:
@@ -81,15 +83,15 @@ def send_message(
 
     if not aprs_password:
         if not CONF.aprs_network.password:
-            click.echo("Must set --aprs-password or APRS_PASSWORD")
+            click.echo('Must set --aprs-password or APRS_PASSWORD')
             ctx.exit(-1)
             return
         else:
             aprs_password = CONF.aprs_network.password
 
-    LOG.info(f"APRSD LISTEN Started version: {aprsd.__version__}")
+    LOG.info(f'APRSD LISTEN Started version: {aprsd.__version__}')
     if type(command) is tuple:
-        command = " ".join(command)
+        command = ' '.join(command)
     if not quiet:
         if raw:
             LOG.info(f"L'{aprs_login}' R'{raw}'")
@@ -129,7 +131,7 @@ def send_message(
                 sys.exit(0)
 
     try:
-        client_factory.create().client
+        client_factory.create().client  # noqa: B018
     except LoginError:
         sys.exit(-1)
 
@@ -140,7 +142,7 @@ def send_message(
     # message
     if raw:
         tx.send(
-            packets.Packet(from_call="", to_call="", raw=raw),
+            packets.Packet(from_call='', to_call='', raw=raw),
             direct=True,
         )
         sys.exit(0)
@@ -164,7 +166,7 @@ def send_message(
         aprs_client = client_factory.create().client
         aprs_client.consumer(rx_packet, raw=False)
     except aprslib.exceptions.ConnectionDrop:
-        LOG.error("Connection dropped, reconnecting")
+        LOG.error('Connection dropped, reconnecting')
         time.sleep(5)
         # Force the deletion of the client object connected to aprs
         # This will cause a reconnect, next time client.get_client()