Update the OP25 generator model to take either a string or an int

Reviewed-on: #2

.gitea/workflows/build.yml

@@ -8,8 +8,6 @@ on:
 jobs:
   release-image:
     runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
     env:
       DOCKER_LATEST: nightly
       CONTAINER_NAME: drb-client-discord-bot
@@ -52,7 +50,7 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: |
-            linux/arm4
+            linux/arm64
           push: true
           tags: | # replace it with your local IP and tags
             git.vpn.cusano.net/${{ vars.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}/${{ env.CONTAINER_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}

.gitignore

@@ -2,4 +2,4 @@ __pycache__*
 bot-poc.py
 configs*
 .env
-*.log
+*.log*

Dockerfile

@@ -26,7 +26,9 @@ RUN apt-get update && \
     libportaudio2 \
     libpulse-dev \
     apulse \
-    ffmpeg 
+    ffmpeg \
+    liquidsoap \
+    supervisor
 
 # Clone the boatbod op25 repository
 RUN git clone -b gr310 https://github.com/boatbod/op25 /op25
@@ -37,6 +39,9 @@ WORKDIR /op25
 # Run the install script to set up op25
 RUN ./install.sh -f
 
+# Update the liquid file
+COPY op25.liq /op25/op25.liq
+
 # Install Python dependencies
 COPY requirements.txt /tmp/requirements.txt
 RUN pip3 install --no-cache-dir -r /tmp/requirements.txt
@@ -66,5 +71,8 @@ COPY ./app/internal/opus /app/internal/opus
 # Copy the rest of the directory contents into the container at /app
 COPY ./app /app
 
-# Run the node script
+# Add Supervisord configuration
-ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001", "--reload"]
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Modify the ENTRYPOINT to run Supervisord
+ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Makefile

@@ -23,6 +23,16 @@ run: build
 		--network=host \
 		$(IMAGE_NAME)
 
+# Deploy docker
+deploy: build
+	docker run --rm -d \
+		--privileged \
+	    -v /dev:/dev \
+	    -v $(shell pwd)/configs:/configs \
+		--name $(CONTAINER_NAME) \
+		--network=host \
+		$(IMAGE_NAME)
+
 # Stop the Docker container
 stop:
 	docker stop $(CONTAINER_NAME)

app/internal/NoiseGatev2.py

@@ -30,15 +30,15 @@ class AudioStream:
             if _input:
                 self.paInstance_kwargs['input_device_index'] = _input_device_index
             else:
-                LOGGER.warning(f"[AudioStream.__init__]:\tInput was not enabled."
+                LOGGER.warning("[AudioStream.__init__]:\tInput was not enabled."
-                               f" Reinitialize with '_input=True'")
+                               " Reinitialize with '_input=True'")
 
         if _output_device_index:
             if _output:
                 self.paInstance_kwargs['output_device_index'] = _output_device_index
             else:
-                LOGGER.warning(f"[AudioStream.__init__]:\tOutput was not enabled."
+                LOGGER.warning("[AudioStream.__init__]:\tOutput was not enabled."
-                               f" Reinitialize with '_output=True'")
+                               " Reinitialize with '_output=True'")
 
         if _init_on_startup:
             # Init PyAudio instance
@@ -59,15 +59,15 @@ class AudioStream:
             if self.paInstance_kwargs['input']:
                 self.paInstance_kwargs['input_device_index'] = _new_input_device_index
             else:
-                LOGGER.warning(f"[AudioStream.init_stream]:\tInput was not enabled when initialized."
+                LOGGER.warning("[AudioStream.init_stream]:\tInput was not enabled when initialized."
-                               f" Reinitialize with '_input=True'")
+                               " Reinitialize with '_input=True'")
 
         if _new_output_device_index:
             if self.paInstance_kwargs['output']:
                 self.paInstance_kwargs['output_device_index'] = _new_output_device_index
             else:
-                LOGGER.warning(f"[AudioStream.init_stream]:\tOutput was not enabled when initialized."
+                LOGGER.warning("[AudioStream.init_stream]:\tOutput was not enabled when initialized."
-                               f" Reinitialize with '_output=True'")
+                               " Reinitialize with '_output=True'")
 
         self.close_if_open()
 
@@ -80,7 +80,7 @@ class AudioStream:
             if self.stream.is_active():
                 self.stream.stop_stream()
                 self.stream.close()
-                LOGGER.debug(f"[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
+                LOGGER.debug("[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
 
     def list_devices(self, _display_input_devices: bool = True, _display_output_devices: bool = True):
         LOGGER.info('Getting a list of the devices connected')
@@ -126,7 +126,7 @@ class NoiseGate(AudioStream):
     def run(self) -> None:
         global voice_connection
         # Start the audio stream
-        LOGGER.debug(f"Starting stream")
+        LOGGER.debug("Starting stream")
         self.stream.start_stream()
         # Start the stream to discord
         self.core()
@@ -139,15 +139,15 @@ class NoiseGate(AudioStream):
             time.sleep(.2)
 
         if not voice_connection.is_playing():
-            LOGGER.debug(f"Playing stream to discord")
+            LOGGER.debug("Playing stream to discord")
             voice_connection.play(self.NGStream, after=self.core)
 
     async def close(self):
-        LOGGER.debug(f"Closing")
+        LOGGER.debug("Closing")
         await voice_connection.disconnect()
         if self.stream.is_active:
             self.stream.stop_stream()
-            LOGGER.debug(f"Stopping stream")
+            LOGGER.debug("Stopping stream")
 
 
 # noinspection PyUnresolvedReferences

app/internal/bot_manager.py

@@ -22,6 +22,8 @@ class DiscordBotManager:
         self.token: Optional[str] = None
         self.loop = asyncio.get_event_loop()
         self.lock = asyncio.Lock()
+        self._ready_event = asyncio.Event()
+        self._voice_ready_event = asyncio.Event()
 
     async def start_bot(self, token: str):
         async with self.lock:
@@ -36,12 +38,17 @@ class DiscordBotManager:
             @self.bot.event
             async def on_ready():
                 LOGGER.info(f'Logged in as {self.bot.user}')
+                # Set the event when on_ready is called
+                self._ready_event.set()
 
             @self.bot.event
             async def on_voice_state_update(member, before, after):
                 # Check if the bot was disconnected
                 if member == self.bot.user and after.channel is None:
                     guild_id = before.channel.guild.id
+                    if not self.voice_clients.get(guild_id):
+                        LOGGER.info("Bot has left channel, reconnection ignored.")
+                        return
                     LOGGER.info(f"Bot was disconnected from channel in guild {guild_id}. Attempting to reconnect...")
                     try:
                         await self.leave_voice_channel(guild_id)
@@ -51,11 +58,28 @@ class DiscordBotManager:
                     await asyncio.sleep(2)
                     await self.join_voice_channel(guild_id, before.channel.id)
 
+                if member == self.bot.user and before.channel is None and after.channel is not None:
+                    print(f"{member.name} joined voice channel {after.channel.name}")
+                    self._voice_ready_event.set()
+
             # Load Opus for the current CPU
             await self.load_opus()
 
+            # Create the task to run the bot in the background
             self.bot_task = self.loop.create_task(self.bot.start(token))
 
+        # Wait for the on_ready event to be set by the bot task
+        LOGGER.info("Waiting for bot to become ready...")
+        try:
+            await asyncio.wait_for(self._ready_event.wait(), timeout=60.0)
+            LOGGER.info("Bot is ready, start_bot returning.")
+            return
+        except asyncio.TimeoutError:
+             LOGGER.error("Timeout waiting for bot to become ready. Bot might have failed to start.")
+             if self.bot_task and not self.bot_task.done():
+                 self.bot_task.cancel()
+             raise RuntimeError("Bot failed to become ready within timeout.")
+
     async def stop_bot(self):
         async with self.lock:
             if self.bot:
@@ -65,6 +89,7 @@ class DiscordBotManager:
                 await self.bot_task
                 self.bot_task = None
             self.voice_clients.clear()
+            self._ready_event.clear()
             LOGGER.info("Bot has been stopped.")
 
     async def join_voice_channel(self, guild_id: int, channel_id: int, ng_threshold: int = 50, device_id: int = 4):
@@ -87,18 +112,27 @@ class DiscordBotManager:
 
         try:
             voice_client = await channel.connect(timeout=60.0, reconnect=True)
-            LOGGER.debug(f"Voice Connected.")
+            LOGGER.debug("Voice Connected.")
             streamHandler = NoiseGate(
                 _input_device_index=device_id,
                 _voice_connection=voice_client,
                 _noise_gate_threshold=ng_threshold)
             streamHandler.run()
-            LOGGER.debug(f"Stream is running.")
+            LOGGER.debug("Stream is running.")
             self.voice_clients[guild_id] = voice_client
             LOGGER.info(f"Joined guild {guild_id} voice channel {channel_id} and stream is running.")
         except Exception as e:
             LOGGER.error(f"Failed to connect to voice channel: {e}")
 
+        LOGGER.info("Waiting for bot to join voice...")
+        try:
+            await asyncio.wait_for(self._voice_ready_event.wait(), timeout=60.0)
+            LOGGER.info("Bot joined voice, returning.")
+            return
+        except asyncio.TimeoutError:
+             LOGGER.error("Timeout waiting for bot to join voice.")
+             raise RuntimeError("Bot failed to join voice within timeout.")
+
     async def leave_voice_channel(self, guild_id: int):
         if not self.bot:
             raise RuntimeError("Bot is not running.")
@@ -119,16 +153,16 @@ class DiscordBotManager:
         if os.name == 'nt':
             if processor == "AMD64":
                 opus.load_opus(os.path.join(script_dir, './opus/libopus_amd64.dll'))
-                LOGGER.info(f"Loaded OPUS library for AMD64")
+                LOGGER.info("Loaded OPUS library for AMD64")
                 return "AMD64"
         else:
             if processor == "aarch64":
                 opus.load_opus(os.path.join(script_dir, './opus/libopus_aarcch64.so'))
-                LOGGER.info(f"Loaded OPUS library for aarch64")
+                LOGGER.info("Loaded OPUS library for aarch64")
                 return "aarch64"
             elif processor == "armv7l":
                 opus.load_opus(os.path.join(script_dir, './opus/libopus_armv7l.so'))
-                LOGGER.info(f"Loaded OPUS library for armv7l")
+                LOGGER.info("Loaded OPUS library for armv7l")
                 return "armv7l"
 
     async def set_presence(self, presence: str):

app/main.py

@@ -1,9 +1,4 @@
-import asyncio
+from fastapi import FastAPI
-import discord
-from discord.ext import commands
-from fastapi import FastAPI, HTTPException
-from pydantic import BaseModel
-from typing import Optional, Dict
 import routers.op25_controller as op25_controller
 import routers.pulse as pulse
 import routers.bot as bot

app/models.py

@@ -1,15 +1,18 @@
 from pydantic import BaseModel
-from typing import List, Optional
+from typing import List, Optional, Union
 from enum import Enum
 
 
 class BotConfig(BaseModel):
     token: str
 
-class VoiceChannelRequest(BaseModel):
+class VoiceChannelJoinRequest(BaseModel):
     guild_id: int
     channel_id: int
 
+class VoiceChannelLeaveRequest(BaseModel):
+    guild_id: int
+
 class DecodeMode(str, Enum):
     P25 = "P25"
     DMR = "DMR"
@@ -22,7 +25,7 @@ class TalkgroupTag(BaseModel):
 class ConfigGenerator(BaseModel):
     type: DecodeMode
     systemName: str
-    channels: List[str]
+    channels: List[Union[int, str]]
     tags: Optional[List[TalkgroupTag]]
     whitelist: Optional[List[int]]
 

app/routers/bot.py

@@ -1,10 +1,5 @@
-import asyncio
-import discord
-from discord.ext import commands
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel
+from models import BotConfig, VoiceChannelJoinRequest, VoiceChannelLeaveRequest
-from typing import Optional, Dict
-from models import BotConfig, VoiceChannelRequest
 from internal.bot_manager import DiscordBotManager
 from internal.logger import create_logger
 
@@ -36,7 +31,7 @@ async def stop_bot():
         raise HTTPException(status_code=400, detail=str(e))
 
 @router.post("/join_voice")
-async def join_voice_channel(request: VoiceChannelRequest):
+async def join_voice_channel(request: VoiceChannelJoinRequest):
     try:
         await bot_manager.join_voice_channel(request.guild_id, request.channel_id)
         return {"status": f"Joined guild {request.guild_id} voice channel {request.channel_id}."}
@@ -45,7 +40,7 @@ async def join_voice_channel(request: VoiceChannelRequest):
         raise HTTPException(status_code=400, detail=str(e))
 
 @router.post("/leave_voice")
-async def leave_voice_channel(request: VoiceChannelRequest):
+async def leave_voice_channel(request: VoiceChannelLeaveRequest):
     try:
         await bot_manager.leave_voice_channel(request.guild_id)
         return {"status": f"Left guild {request.guild_id} voice channel."}

app/routers/op25_controller.py

@@ -1,12 +1,12 @@
 from fastapi import HTTPException, APIRouter
-from pydantic import BaseModel
 import subprocess
 import os
 import signal
 import json
 import csv
-from models import *
+from models import ConfigGenerator, DecodeMode, ChannelConfig, DeviceConfig, TrunkingConfig, TrunkingChannelConfig, AudioConfig, TerminalConfig, TalkgroupTag
 from internal.logger import create_logger
+from typing import List
 
 router = APIRouter()
 LOGGER = create_logger(__name__)

op25.liq

@@ -0,0 +1,54 @@
+#!/usr/bin/liquidsoap
+
+# Example liquidsoap streaming from op25 to icecast
+# (c) 2019-2021 gnorbury@bondcar.com, wllmbecks@gmail.com
+#
+
+set("log.stdout", true)
+set("log.file", false)
+set("log.level", 1)
+
+# Make the native sample rate compatible with op25
+set("frame.audio.samplerate", 8000)
+
+input = mksafe(input.external(buffer=0.25, channels=2, samplerate=8000, restart_on_error=false, "./audio.py -x 1.5 -s"))
+# Consider increasing the buffer value on slow systems such as RPi3. e.g. buffer=0.25
+# Longer buffer results in less choppy audio but at the expense of increased latency.
+
+
+# OPTIONAL AUDIO SIGNAL PROCESSING BLOCKS 
+# Uncomment to enable
+#
+# High pass filter
+#input = filter.iir.butterworth.high(frequency = 200.0, order = 4, input)
+
+# Low pass filter
+#input = filter.iir.butterworth.low(frequency = 3250.0, order = 4, input)
+
+# 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)
+
+
+# LOCAL AUDIO OUTPUT
+# Uncomment the appropriate line below to enable local sound
+#
+# Default audio subsystem
+#out (input)
+#
+# PulseAudio
+#output.pulseaudio(input)
+#
+# ALSA
+#output.alsa(input)
+
+
+
+# ICECAST STREAMING
+# Uncomment to enable output to an icecast server
+# Change the "host", "password", and "mount" strings appropriately first!
+# For metadata to work properly, the host address given here MUST MATCH the address in op25's meta.json file
+#
+output.icecast(%mp3(bitrate=16, samplerate=22050, stereo=false), description="op25", genre="Public Safety", url="", fallible=false, host="localhost", port=8000, mount="mountpoint", password="hackme", mean(input))

supervisord.conf

@@ -0,0 +1,20 @@
+[supervisord]
+nodaemon=true
+
+[program:op25-liq]
+command=/usr/bin/liquidsoap /op25/op25.liq
+directory=/op25
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/supervisor/op25-liq.err.log
+stdout_logfile=/var/log/supervisor/op25-liq.out.log
+user=root
+
+[program:drb-client-discord]
+command=uvicorn main:app --host 0.0.0.0 --port 8001 --reload
+directory=/app
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/supervisor/main_app.err.log
+stdout_logfile=/var/log/supervisor/main_app.out.log
+user=root