imonlinux
1da9ac1fac
Summary Add thread-safe locking for wake word reload logic Problem Wake word reload logic accessed self.state.wake_words_changed flag without synchronization, creating a potential race condition when wake words are dynamically switched via Home Assistant. Changes Added self._wake_words_lock = threading.Lock() in __init__ Wrapped wake word reload block with with self._wake_words_lock: context manager Ensures atomic read-modify-write of wake_words_changed flag Impact Risk: Very low - purely defensive improvement Benefit: Eliminates race condition in wake word switching Performance: Negligible overhead (lock only held during reload check)
266 lines
12 KiB
Python
266 lines
12 KiB
Python
"""Audio processing engine."""
|
|
|
|
import asyncio
|
|
import logging
|
|
import threading
|
|
import time
|
|
import warnings
|
|
from typing import Dict, List, Optional, Union
|
|
|
|
import numpy as np
|
|
import soundcard as sc
|
|
|
|
from pymicro_wakeword import MicroWakeWord, MicroWakeWordFeatures
|
|
from pyopen_wakeword import OpenWakeWord, OpenWakeWordFeatures
|
|
|
|
from .models import ServerState
|
|
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
# Suppress the "log(0)" warning from pymicro_wakeword
|
|
warnings.filterwarnings("ignore", category=RuntimeWarning, module="pymicro_wakeword")
|
|
|
|
|
|
class AudioEngine:
|
|
def __init__(self, state: ServerState, mic, block_size: int):
|
|
self.state = state
|
|
self.mic = mic
|
|
self.block_size = block_size
|
|
self._thread: Optional[threading.Thread] = None
|
|
|
|
# CRITICAL FIX: Add lock for thread-safe wake word reload
|
|
self._wake_words_lock = threading.Lock()
|
|
|
|
def start(self):
|
|
"""Starts the audio processing thread."""
|
|
self._thread = threading.Thread(
|
|
target=self._process_audio,
|
|
daemon=True,
|
|
name="AudioEngineThread",
|
|
)
|
|
self._thread.start()
|
|
|
|
def stop(self):
|
|
"""Stops the audio processing thread."""
|
|
self.state.shutdown = True
|
|
# Ensure thread wakes up if waiting
|
|
self.state.mic_muted_event.set()
|
|
if self._thread:
|
|
self._thread.join()
|
|
|
|
def _process_audio(self):
|
|
"""Main audio processing loop."""
|
|
_LOGGER.debug("Audio engine started.")
|
|
|
|
micro_features = MicroWakeWordFeatures()
|
|
oww_features: Optional[OpenWakeWordFeatures] = None
|
|
|
|
wake_words: List[Union[MicroWakeWord, OpenWakeWord]] = []
|
|
micro_inputs: List[np.ndarray] = []
|
|
oww_inputs: List[np.ndarray] = []
|
|
has_oww = False
|
|
|
|
# Track last activation time per wake word (by id or phrase)
|
|
last_active_by_id: Dict[str, float] = {}
|
|
|
|
try:
|
|
while True:
|
|
# --- Handle Mute State ---
|
|
if not self.state.mic_muted_event.is_set():
|
|
_LOGGER.debug("Audio thread muted. Waiting...")
|
|
self.state.mic_muted_event.wait()
|
|
|
|
if self.state.shutdown:
|
|
return
|
|
|
|
# Unmuted: Clear buffers and prepare
|
|
_LOGGER.debug("Audio thread unmuted. Flushing...")
|
|
micro_features.reset()
|
|
if oww_features is not None:
|
|
oww_features.reset()
|
|
|
|
# Allow immediate activation (don't enforce refractory here)
|
|
last_active_by_id.clear()
|
|
|
|
# Flush hardware buffer
|
|
try:
|
|
with self.mic.recorder(
|
|
samplerate=16000,
|
|
channels=1,
|
|
blocksize=self.block_size,
|
|
) as mic_in:
|
|
mic_in.flush()
|
|
except Exception as e:
|
|
_LOGGER.warning("Error flushing mic: %s", e)
|
|
|
|
if self.state.shutdown:
|
|
return
|
|
|
|
# --- Main Recording Loop ---
|
|
_LOGGER.debug("Opening audio input device: %s", self.mic.name)
|
|
with self.mic.recorder(
|
|
samplerate=16000, channels=1, blocksize=self.block_size
|
|
) as mic_in:
|
|
while self.state.mic_muted_event.is_set():
|
|
if self.state.shutdown:
|
|
return
|
|
|
|
audio_chunk_array = mic_in.record(self.block_size).reshape(-1)
|
|
audio_chunk = (
|
|
(np.clip(audio_chunk_array, -1.0, 1.0) * 32767.0)
|
|
.astype("<i2")
|
|
.tobytes()
|
|
)
|
|
|
|
if self.state.satellite is None:
|
|
time.sleep(0.01)
|
|
continue
|
|
|
|
# CRITICAL FIX: Protect wake word reload with lock
|
|
with self._wake_words_lock:
|
|
# Update active wake words if changed
|
|
if (not wake_words) or (self.state.wake_words_changed):
|
|
self.state.wake_words_changed = False
|
|
wake_words = [
|
|
ww
|
|
for ww in self.state.wake_words.values()
|
|
if ww.id in self.state.active_wake_words
|
|
]
|
|
has_oww = any(
|
|
isinstance(ww, OpenWakeWord) for ww in wake_words
|
|
)
|
|
|
|
if has_oww and (oww_features is None):
|
|
_LOGGER.debug(
|
|
"Initializing OpenWakeWord features..."
|
|
)
|
|
oww_features = OpenWakeWordFeatures.from_builtin()
|
|
|
|
_LOGGER.debug(
|
|
"Rebuilt wake_words list: %s (has_oww=%s, active_ids=%s)",
|
|
[
|
|
getattr(ww, "wake_word", getattr(ww, "id", "?"))
|
|
for ww in wake_words
|
|
],
|
|
has_oww,
|
|
self.state.active_wake_words,
|
|
)
|
|
|
|
try:
|
|
# Feature extraction
|
|
micro_inputs.clear()
|
|
micro_inputs.extend(
|
|
micro_features.process_streaming(audio_chunk)
|
|
)
|
|
|
|
if has_oww and oww_features:
|
|
oww_inputs.clear()
|
|
oww_inputs.extend(
|
|
oww_features.process_streaming(audio_chunk)
|
|
)
|
|
|
|
# Wake word detection
|
|
for wake_word in wake_words:
|
|
activated = False
|
|
if isinstance(wake_word, MicroWakeWord):
|
|
if any(
|
|
wake_word.process_streaming(mi)
|
|
for mi in micro_inputs
|
|
):
|
|
activated = True
|
|
elif isinstance(wake_word, OpenWakeWord):
|
|
if any(
|
|
p > 0.5
|
|
for oi in oww_inputs
|
|
for p in wake_word.process_streaming(oi)
|
|
):
|
|
activated = True
|
|
|
|
if activated:
|
|
wake_phrase = getattr(
|
|
wake_word, "wake_word", "wake word"
|
|
)
|
|
wake_id_attr = getattr(wake_word, "id", None)
|
|
# Use id if available, otherwise phrase string as key
|
|
id_key = wake_id_attr or wake_phrase
|
|
|
|
_LOGGER.debug(
|
|
"Wake word ACTIVATED: %s (id=%s)",
|
|
wake_phrase,
|
|
wake_id_attr,
|
|
)
|
|
|
|
now = time.monotonic()
|
|
last_active = last_active_by_id.get(id_key)
|
|
|
|
# If refractory_seconds <= 0, disable gating
|
|
refractory = max(self.state.refractory_seconds, 0.0)
|
|
|
|
if (last_active is None) or (
|
|
(now - last_active) > refractory
|
|
):
|
|
_LOGGER.debug(
|
|
"Wake word ACCEPTED (phrase=%s); "
|
|
"triggering wakeup (Δt=%.2f, refractory=%.2f)",
|
|
wake_phrase,
|
|
0.0
|
|
if last_active is None
|
|
else now - last_active,
|
|
refractory,
|
|
)
|
|
last_active_by_id[id_key] = now
|
|
self.state.loop.call_soon_threadsafe(
|
|
self.state.satellite.wakeup, wake_word
|
|
)
|
|
else:
|
|
_LOGGER.debug(
|
|
"Wake word REJECTED by refractory period "
|
|
"(phrase=%s, Δt=%.2f < %.2f)",
|
|
wake_phrase,
|
|
now - last_active,
|
|
refractory,
|
|
)
|
|
|
|
# Stop word detection
|
|
stopped = False
|
|
for micro_input in micro_inputs:
|
|
if self.state.stop_word.process_streaming(micro_input):
|
|
stopped = True
|
|
|
|
if stopped:
|
|
_LOGGER.debug(
|
|
"Stop wake word ACTIVATED (id=%s, active_wake_words=%s)",
|
|
getattr(self.state.stop_word, "id", None),
|
|
self.state.active_wake_words,
|
|
)
|
|
|
|
if (
|
|
stopped
|
|
and self.state.stop_word.id
|
|
in self.state.active_wake_words
|
|
):
|
|
_LOGGER.debug(
|
|
"Stop wake word ACCEPTED; calling satellite.stop()"
|
|
)
|
|
self.state.loop.call_soon_threadsafe(
|
|
self.state.satellite.stop
|
|
)
|
|
elif stopped:
|
|
_LOGGER.debug(
|
|
"Stop wake word TRIGGERED but IGNORED because "
|
|
"id=%s not in active_wake_words",
|
|
getattr(self.state.stop_word, "id", None),
|
|
)
|
|
|
|
# Pass audio to satellite (for voice streaming)
|
|
self.state.loop.call_soon_threadsafe(
|
|
self.state.satellite.handle_audio, audio_chunk
|
|
)
|
|
|
|
except Exception:
|
|
_LOGGER.exception("Unexpected error handling audio")
|
|
|
|
except Exception as e:
|
|
_LOGGER.critical("A soundcard error occurred: %s", e)
|
|
self.state.loop.call_soon_threadsafe(self.state.loop.stop)
|