Initial commit — DRB client (edge node) stack

Includes edge-node (FastAPI/MQTT/Discord voice), op25-container (SDR decoder),
and icecast (audio streaming).

op25-container/app/internal/liquidsoap_config_utils.py

@@ -0,0 +1,34 @@
+import os
+from internal.op25_liq_template import liquidsoap_config_template
+from models import IcecastConfig
+
+def generate_liquid_script(config: IcecastConfig):
+    """
+    Generates the "*.liq" file that's run by OP25 on startup. 
+
+    Placeholders in the template must be formatted as ${VARIABLE_NAME}.
+
+    Args:
+        config (dict): A dictionary of key-value pairs for substitution.
+                          Keys should match the variable names in the template (e.g., 'icecast_host').
+    """
+    try:
+        content = liquidsoap_config_template
+        # Replace variables
+        for key, value in config.model_dump().items():
+            placeholder = f"${{{key}}}"
+            # Ensure the value is converted to string for replacement
+            content = content.replace(placeholder, str(value))
+            print(f"  - Replaced placeholder {placeholder}")
+
+        # Write the processed content to the output path
+        output_path = "/configs/op25.liq"
+        with open(output_path, 'w') as f:
+            f.write(content)
+
+        print(f"\nSuccessfully wrote processed configuration to: {output_path}")
+
+    except FileNotFoundError:
+        print(f"Error: Template file not found at {template_path}")
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}")

op25-container/app/internal/logger.py

@@ -0,0 +1,55 @@
+import logging
+from logging.handlers import RotatingFileHandler
+
+def create_logger(name, level=logging.DEBUG, max_bytes=10485760, backup_count=2):
+    """
+    Creates a logger with a console and rotating file handlers for both debug and info log levels.
+
+    Args:
+        name (str): The name for the logger.
+        level (int): The logging level for the logger. Defaults to logging.DEBUG.
+        max_bytes (int): Maximum size of the log file in bytes before it gets rotated. Defaults to 10 MB.
+        backup_count (int): Number of backup files to keep. Defaults to 2.
+
+    Returns:
+        logging.Logger: Configured logger.
+    """
+    # Set the log file paths
+    debug_log_file = "./client.debug.log"
+    info_log_file = "./client.log"
+
+    # Create a logger
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+
+    # Check if the logger already has handlers to avoid duplicate logs
+    if not logger.hasHandlers():
+        # Create console handler
+        console_handler = logging.StreamHandler()
+        console_handler.setLevel(level)
+
+        # Create rotating file handler for debug level
+        debug_file_handler = RotatingFileHandler(debug_log_file, maxBytes=max_bytes, backupCount=backup_count)
+        debug_file_handler.setLevel(logging.DEBUG)
+
+        # Create rotating file handler for info level
+        info_file_handler = RotatingFileHandler(info_log_file, maxBytes=max_bytes, backupCount=backup_count)
+        info_file_handler.setLevel(logging.INFO)
+
+        # Create formatter and add it to the handlers
+        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        console_handler.setFormatter(formatter)
+        debug_file_handler.setFormatter(formatter)
+        info_file_handler.setFormatter(formatter)
+
+        # Add the handlers to the logger
+        logger.addHandler(console_handler)
+        logger.addHandler(debug_file_handler)
+        logger.addHandler(info_file_handler)
+
+    return logger
+
+# Example usage:
+# logger = create_logger('my_logger')
+# logger.debug('This is a debug message')
+# logger.info('This is an info message')

op25-container/app/internal/op25_config_utls.py

@@ -0,0 +1,70 @@
+import csv
+import json
+from models import TalkgroupTag
+from typing import List
+from internal.logger import create_logger
+
+LOGGER = create_logger(__name__)
+
+def save_talkgroup_tags(talkgroup_tags: List[TalkgroupTag]) -> None:
+    """
+    Writes a list of tags to the tags file.
+
+    Args:
+        talkgroup_tags (List[TalkgroupTag]): The list of TalkgroupTag instances.
+    """
+    with open("/configs/active.cfg.tags.tsv", 'w', newline='', encoding='utf-8') as file:
+        writer = csv.writer(file, delimiter='\t', lineterminator='\n')
+        # Write rows
+        for tag in talkgroup_tags:
+            writer.writerow([tag.tagDec, tag.talkgroup])
+
+def save_whitelist(talkgroup_tags: List[int]) -> None:
+    """
+    Writes a list of talkgroups to the whitelists file.
+
+    Args:
+        talkgroup_tags (List[int]): The list of decimals to whitelist.
+    """
+    with open("/configs/active.cfg.whitelist.tsv", 'w', newline='', encoding='utf-8') as file:
+        writer = csv.writer(file, delimiter='\t', lineterminator='\n')
+        # Write rows
+        for tag in talkgroup_tags:
+            writer.writerow([tag])
+
+def del_none_in_dict(d):
+    """
+    Delete keys with the value ``None`` in a dictionary, recursively.
+
+    This alters the input so you may wish to ``copy`` the dict first.
+    """
+    for key, value in list(d.items()):
+        LOGGER.info(f"Key: '{key}'\nValue: '{value}'")
+        if value is None:
+            del d[key]
+        elif isinstance(value, dict):
+            del_none_in_dict(value)
+        elif isinstance(value, list):
+            for iterative_value in value:
+                del_none_in_dict(iterative_value)
+    return d  # For convenience
+
+def get_current_system_from_config() -> str:
+    # Get the current config
+    with open('/configs/active.cfg.json', 'r') as f:
+        json_data = f.read()
+        if isinstance(json_data, str):
+            try:
+                data = json.loads(json_data)
+            except json.JSONDecodeError:
+                return None
+        elif isinstance(json_data, dict):
+            data = json_data
+        else:
+            return None
+
+        if "channels" in data and isinstance(data["channels"], list) and len(data["channels"]) > 0:
+            first_channel = data["channels"][0]
+            if "name" in first_channel:
+                return first_channel["name"]
+    return None

op25-container/app/internal/op25_liq_template.py

@@ -0,0 +1,44 @@
+liquidsoap_config_template = """#!/usr/bin/liquidsoap
+
+# OP25 → Icecast streaming (Liquidsoap 2.x)
+
+settings.log.stdout.set(true)
+settings.log.file.set(false)
+settings.log.level.set(1)
+settings.frame.audio.samplerate.set(8000)
+settings.init.allow_root.set(true)
+
+# ==========================================================
+ICE_HOST = "${icecast_host}"
+ICE_PORT = ${icecast_port}
+ICE_MOUNT = "${icecast_mountpoint}"
+ICE_PASSWORD = "${icecast_password}"
+ICE_DESCRIPTION = "${icecast_description}"
+ICE_GENRE = "${icecast_genre}"
+# ==========================================================
+
+input = mksafe(input.external(buffer=0.25, channels=2, samplerate=8000, restart_on_error=false, "./audio.py -x 2.5 -s"))
+# Consider increasing the buffer value on slow systems such as RPi3. e.g. buffer=0.25
+
+# Compression
+input = compress(input, attack = 2.0, gain = 0.0, knee = 13.0, ratio = 2.0, release = 12.3, threshold = -18.0)
+
+# Normalization
+input = normalize(input, gain_max = 6.0, gain_min = -6.0, target = -16.0, threshold = -65.0)
+
+# ==========================================================
+# OUTPUT: Referencing the new variables
+# ==========================================================
+output.icecast(
+    %mp3(bitrate=16, samplerate=22050, stereo=false), 
+    description=ICE_DESCRIPTION, 
+    genre=ICE_GENRE, 
+    url="", 
+    fallible=false, 
+    host=ICE_HOST, 
+    port=ICE_PORT, 
+    mount=ICE_MOUNT, 
+    password=ICE_PASSWORD, 
+    mean(input)
+)
+"""