Merge branch 'master' into docker
This commit is contained in:
@@ -6,5 +6,6 @@
|
|||||||
!script/run
|
!script/run
|
||||||
!wyoming_satellite/*.py
|
!wyoming_satellite/*.py
|
||||||
!wyoming_satellite/utils
|
!wyoming_satellite/utils
|
||||||
|
!wyoming_satellite/VERSION
|
||||||
!docker/run
|
!docker/run
|
||||||
!sounds/*.wav
|
!sounds/*.wav
|
||||||
|
|||||||
@@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 1.1.1
|
||||||
|
|
||||||
|
- Bump to wyoming 1.5.2 (package fix)
|
||||||
|
|
||||||
|
## 1.1.0
|
||||||
|
|
||||||
|
- Bump to wyoming 1.5.1
|
||||||
|
- Send wyoming-satellite version in `info` message
|
||||||
|
- Ping server if supported (faster awareness of disconnection)
|
||||||
|
- Support `pause-satellite` message
|
||||||
|
- Stop streaming/wake word detection as soon as `pause-satellite` is received or server disconnects
|
||||||
|
- Mute microphone when awake WAV is playing
|
||||||
|
|
||||||
## 1.0.0
|
## 1.0.0
|
||||||
|
|
||||||
- Initial release
|
- Initial release
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
include requirements.txt
|
include requirements.txt
|
||||||
|
include VERSION
|
||||||
|
|||||||
@@ -22,6 +22,14 @@ Requires:
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
Install the necessary system dependencies:
|
||||||
|
|
||||||
|
``` sh
|
||||||
|
sudo apt-get install python3-venv python3-pip
|
||||||
|
```
|
||||||
|
|
||||||
|
Then run the install script:
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
script/setup
|
script/setup
|
||||||
```
|
```
|
||||||
@@ -168,5 +176,7 @@ Satellites can respond to events from the server by running commands:
|
|||||||
* `--tts-start-command` - text-to-speech response started (no stdin)
|
* `--tts-start-command` - text-to-speech response started (no stdin)
|
||||||
* `--tts-stop-command` - text-to-speech response stopped (no stdin)
|
* `--tts-stop-command` - text-to-speech response stopped (no stdin)
|
||||||
* `--error-command` - an error was sent from the server (text on stdin)
|
* `--error-command` - an error was sent from the server (text on stdin)
|
||||||
|
* `--connected-command` - satellite connected to server
|
||||||
|
* `--disconnected-command` - satellite disconnected from server
|
||||||
|
|
||||||
For more advanced scenarios, use an event service (`--event-uri`). See `wyoming_satellite/example_event_client.py` for a basic client that just logs events.
|
For more advanced scenarios, use an event service (`--event-uri`). See `wyoming_satellite/example_event_client.py` for a basic client that just logs events.
|
||||||
|
|||||||
@@ -56,7 +56,8 @@ python3 -m venv .venv
|
|||||||
.venv/bin/pip3 install \
|
.venv/bin/pip3 install \
|
||||||
-f 'https://synesthesiam.github.io/prebuilt-apps/' \
|
-f 'https://synesthesiam.github.io/prebuilt-apps/' \
|
||||||
-r requirements.txt \
|
-r requirements.txt \
|
||||||
-r requirements_extra.txt
|
-r requirements_audio_enhancement.txt \
|
||||||
|
-r requirements_vad.txt
|
||||||
```
|
```
|
||||||
|
|
||||||
If the installation was successful, you should be able to run:
|
If the installation was successful, you should be able to run:
|
||||||
@@ -301,7 +302,7 @@ cd wyoming-satellite/examples
|
|||||||
python3 -m venv --system-site-packages .venv
|
python3 -m venv --system-site-packages .venv
|
||||||
.venv/bin/pip3 install --upgrade pip
|
.venv/bin/pip3 install --upgrade pip
|
||||||
.venv/bin/pip3 install --upgrade wheel setuptools
|
.venv/bin/pip3 install --upgrade wheel setuptools
|
||||||
.venv/bin/pip3 install 'wyoming==1.4.1'
|
.venv/bin/pip3 install 'wyoming==1.5.2'
|
||||||
```
|
```
|
||||||
|
|
||||||
The `--system-site-packages` argument is used to access the pre-installed `gpiozero` and `spidev` Python packages. If these are **not already installed** in your system, run:
|
The `--system-site-packages` argument is used to access the pre-installed `gpiozero` and `spidev` Python packages. If these are **not already installed** in your system, run:
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
# Tutorial with Installer
|
||||||
|
|
||||||
|
Create a voice satellite using a Raspberry Pi 3+ and USB microphone and speakers.
|
||||||
|
|
||||||
|
## Install OS
|
||||||
|
|
||||||
|
Follow instructions to [install Raspberry Pi OS](https://www.raspberrypi.com/software/). Under "Choose OS", pick "Raspberry Pi OS (other)" and "Raspberry Pi OS (Legacy, **64-bit**) Lite".
|
||||||
|
|
||||||
|
When asking if you'd like to apply customization settings, choose "Edit Settings" and:
|
||||||
|
|
||||||
|
* Set a username/password
|
||||||
|
* Configure the wireless LAN
|
||||||
|
* Under the Services tab, enable SSH and use password authentication
|
||||||
|
|
||||||
|
## Install Dependencies
|
||||||
|
|
||||||
|
After flashing and booting the satellite, connect to it over SSH using the username/password you configured during flashing.
|
||||||
|
|
||||||
|
**On the satellite**, make sure system dependencies are installed:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install --no-install-recommends \
|
||||||
|
git \
|
||||||
|
python3-venv
|
||||||
|
```
|
||||||
|
|
||||||
|
Clone the `wyoming-satellite` repository:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git clone https://github.com/rhasspy/wyoming-satellite.git
|
||||||
|
```
|
||||||
|
|
||||||
|
Now you can run the installer:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cd wyoming-satellite/
|
||||||
|
python3 -m installer
|
||||||
|
```
|
||||||
|
|
||||||
|
## Satellite
|
||||||
|
|
||||||
|
Under the "Satellite" menu, select "Satellite Type" and choose "Local wake word detection" (with the space bar).
|
||||||
|
|
||||||
|
## Microphone
|
||||||
|
|
||||||
|
Make sure you USB microphone is plugged in.
|
||||||
|
|
||||||
|
Under the "Microphone" menu, select "Autodetect", and speak loudly into the microphone for a few seconds.
|
||||||
|
|
||||||
|
In "Audio Settings", set "Noise Suppression" to "Medium" and "Auto Gain" to 15.
|
||||||
|
|
||||||
|
## Speakers
|
||||||
|
|
||||||
|
Make sure your USB speakers are plugged in.
|
||||||
|
|
||||||
|
Under the "Speakers" menu, choose "Test All Speakers". For each device, choose "Play Sound" and listen. If you hear the sound, select "Choose This Device"; otherwise, select "Next Device".
|
||||||
|
|
||||||
|
In "Toggle Feedback Sounds", enable "On wake-up" and "After voice command" (with the space bar).
|
||||||
|
|
||||||
|
## Wake Word
|
||||||
|
|
||||||
|
Under the "Wake Word" menu, select "Wake Word System" and choose "openWakeWord" (with the space bar). When prompted, install openWakeWord.
|
||||||
|
|
||||||
|
In the "openWakeWord" menu, choose "Download Community Wake Words". Back in the "Wake Word" menu, select "Choose Wake Word" and select one (with the space bar).
|
||||||
|
|
||||||
|
## Apply Settings
|
||||||
|
|
||||||
|
From the main menu, select "Apply Settings" and enter your password.
|
||||||
|
|
||||||
|
Check logs with:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo journalctl -f -u wyoming-satellite.service
|
||||||
|
```
|
||||||
@@ -12,7 +12,13 @@ import gpiozero
|
|||||||
import spidev
|
import spidev
|
||||||
from wyoming.asr import Transcript
|
from wyoming.asr import Transcript
|
||||||
from wyoming.event import Event
|
from wyoming.event import Event
|
||||||
from wyoming.satellite import RunSatellite, StreamingStarted, StreamingStopped
|
from wyoming.satellite import (
|
||||||
|
RunSatellite,
|
||||||
|
SatelliteConnected,
|
||||||
|
SatelliteDisconnected,
|
||||||
|
StreamingStarted,
|
||||||
|
StreamingStopped,
|
||||||
|
)
|
||||||
from wyoming.server import AsyncEventHandler, AsyncServer
|
from wyoming.server import AsyncEventHandler, AsyncServer
|
||||||
from wyoming.vad import VoiceStarted
|
from wyoming.vad import VoiceStarted
|
||||||
from wyoming.wake import Detection
|
from wyoming.wake import Detection
|
||||||
@@ -107,6 +113,15 @@ class LEDsEventHandler(AsyncEventHandler):
|
|||||||
self.color(_BLACK)
|
self.color(_BLACK)
|
||||||
elif RunSatellite.is_type(event.type):
|
elif RunSatellite.is_type(event.type):
|
||||||
self.color(_BLACK)
|
self.color(_BLACK)
|
||||||
|
elif SatelliteConnected.is_type(event.type):
|
||||||
|
# Flash
|
||||||
|
for _ in range(3):
|
||||||
|
self.color(_GREEN)
|
||||||
|
await asyncio.sleep(0.3)
|
||||||
|
self.color(_BLACK)
|
||||||
|
await asyncio.sleep(0.3)
|
||||||
|
elif SatelliteDisconnected.is_type(event.type):
|
||||||
|
self.color(_RED)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,13 @@ import gpiozero
|
|||||||
import spidev
|
import spidev
|
||||||
from wyoming.asr import Transcript
|
from wyoming.asr import Transcript
|
||||||
from wyoming.event import Event
|
from wyoming.event import Event
|
||||||
from wyoming.satellite import RunSatellite, StreamingStarted, StreamingStopped
|
from wyoming.satellite import (
|
||||||
|
RunSatellite,
|
||||||
|
SatelliteConnected,
|
||||||
|
SatelliteDisconnected,
|
||||||
|
StreamingStarted,
|
||||||
|
StreamingStopped,
|
||||||
|
)
|
||||||
from wyoming.server import AsyncEventHandler, AsyncServer
|
from wyoming.server import AsyncEventHandler, AsyncServer
|
||||||
from wyoming.vad import VoiceStarted
|
from wyoming.vad import VoiceStarted
|
||||||
from wyoming.wake import Detection
|
from wyoming.wake import Detection
|
||||||
@@ -107,6 +113,15 @@ class LEDsEventHandler(AsyncEventHandler):
|
|||||||
self.color(_BLACK)
|
self.color(_BLACK)
|
||||||
elif RunSatellite.is_type(event.type):
|
elif RunSatellite.is_type(event.type):
|
||||||
self.color(_BLACK)
|
self.color(_BLACK)
|
||||||
|
elif SatelliteConnected.is_type(event.type):
|
||||||
|
# Flash
|
||||||
|
for _ in range(3):
|
||||||
|
self.color(_GREEN)
|
||||||
|
await asyncio.sleep(0.3)
|
||||||
|
self.color(_BLACK)
|
||||||
|
await asyncio.sleep(0.3)
|
||||||
|
elif SatelliteDisconnected.is_type(event.type):
|
||||||
|
self.color(_RED)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
"""Command-line installer."""
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
"""Command-line installer."""
|
||||||
|
import logging
|
||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from .const import LOCAL_DIR, PROGRAM_DIR, SatelliteType, Settings
|
||||||
|
from .drivers import install_drivers
|
||||||
|
from .microphone import configure_microphone
|
||||||
|
from .packages import (
|
||||||
|
can_import,
|
||||||
|
install_packages,
|
||||||
|
install_packages_nogui,
|
||||||
|
packages_installed,
|
||||||
|
)
|
||||||
|
from .satellite import configure_satellite
|
||||||
|
from .services import generate_services, install_services, stop_services
|
||||||
|
from .speakers import configure_speakers
|
||||||
|
from .wake_word import configure_wake_word
|
||||||
|
from .whiptail import ItemType, error, menu, msgbox, passwordbox, run_with_gauge
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
LOCAL_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
logging.basicConfig(
|
||||||
|
filename=LOCAL_DIR / "installer.log", filemode="w", level=logging.DEBUG
|
||||||
|
)
|
||||||
|
|
||||||
|
settings = Settings.load()
|
||||||
|
|
||||||
|
if not packages_installed("whiptail"):
|
||||||
|
install_packages_nogui("whiptail")
|
||||||
|
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = main_menu(choice)
|
||||||
|
|
||||||
|
if choice == "satellite":
|
||||||
|
configure_satellite(settings)
|
||||||
|
elif choice == "microphone":
|
||||||
|
configure_microphone(settings)
|
||||||
|
elif choice == "speakers":
|
||||||
|
configure_speakers(settings)
|
||||||
|
elif choice == "wake":
|
||||||
|
configure_wake_word(settings)
|
||||||
|
elif choice == "drivers":
|
||||||
|
install_drivers(settings)
|
||||||
|
elif choice == "apply":
|
||||||
|
apply_settings(settings)
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def main_menu(last_choice: Optional[str]) -> Optional[str]:
|
||||||
|
items: List[ItemType] = [
|
||||||
|
("satellite", "Satellite"),
|
||||||
|
("microphone", "Microphone"),
|
||||||
|
("speakers", "Speakers"),
|
||||||
|
("wake", "Wake Word"),
|
||||||
|
("drivers", "Drivers"),
|
||||||
|
("apply", "Apply Settings"),
|
||||||
|
]
|
||||||
|
|
||||||
|
return menu(
|
||||||
|
"Main",
|
||||||
|
items,
|
||||||
|
selected_item=last_choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Exit"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def pip_install(*args) -> List[str]:
|
||||||
|
return [
|
||||||
|
str(PROGRAM_DIR / ".venv" / "bin" / "pip3"),
|
||||||
|
"install",
|
||||||
|
"--extra-index-url",
|
||||||
|
"https://www.piwheels.org/simple",
|
||||||
|
"-f",
|
||||||
|
"https://synesthesiam.github.io/prebuilt-apps/",
|
||||||
|
] + list(args)
|
||||||
|
|
||||||
|
|
||||||
|
def apply_settings(settings: Settings) -> None:
|
||||||
|
if settings.mic.device is None:
|
||||||
|
msgbox("Please configure microphone")
|
||||||
|
return
|
||||||
|
|
||||||
|
if (settings.satellite.type == SatelliteType.WAKE) and (
|
||||||
|
settings.wake.system is None
|
||||||
|
):
|
||||||
|
msgbox("Please set wake word system")
|
||||||
|
return
|
||||||
|
|
||||||
|
password: Optional[str] = None
|
||||||
|
if not packages_installed("python3-pip", "python3-venv"):
|
||||||
|
password = passwordbox("sudo password:")
|
||||||
|
if not password:
|
||||||
|
return
|
||||||
|
|
||||||
|
success = install_packages(
|
||||||
|
"Installing Python packages...", password, "python3-pip", "python3-venv"
|
||||||
|
)
|
||||||
|
if not success:
|
||||||
|
error("installing pip/venv for Python")
|
||||||
|
return
|
||||||
|
|
||||||
|
# Satellite venv
|
||||||
|
venv_dir = PROGRAM_DIR / ".venv"
|
||||||
|
if not venv_dir.exists():
|
||||||
|
result = run_with_gauge(
|
||||||
|
"Creating virtual environment...", [str(PROGRAM_DIR / "script" / "setup")]
|
||||||
|
)
|
||||||
|
if not result:
|
||||||
|
error("creating virtual environment")
|
||||||
|
return
|
||||||
|
|
||||||
|
# silero (vad)
|
||||||
|
if (settings.satellite.type == SatelliteType.VAD) and (
|
||||||
|
not can_import("pysilero_vad")
|
||||||
|
):
|
||||||
|
result = run_with_gauge(
|
||||||
|
"Installing vad...",
|
||||||
|
[pip_install("-r", str(PROGRAM_DIR / "requirements_vad.txt"))],
|
||||||
|
)
|
||||||
|
if not result:
|
||||||
|
error("installing vad")
|
||||||
|
return
|
||||||
|
|
||||||
|
# webrtc (audio enhancements)
|
||||||
|
if ((settings.mic.noise_suppression > 0) or (settings.mic.auto_gain > 0)) and (
|
||||||
|
not can_import("webrtc_noise_gain")
|
||||||
|
):
|
||||||
|
result = run_with_gauge(
|
||||||
|
"Installing audio enhancements...",
|
||||||
|
[
|
||||||
|
pip_install(
|
||||||
|
"-r", str(PROGRAM_DIR / "requirements_audio_enhancement.txt")
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
|
if not result:
|
||||||
|
error("installing audio enhancements")
|
||||||
|
return
|
||||||
|
|
||||||
|
if (
|
||||||
|
settings.satellite.event_service_command
|
||||||
|
and (
|
||||||
|
("2mic" in settings.satellite.event_service_command)
|
||||||
|
or ("4mic" in settings.satellite.event_service_command)
|
||||||
|
)
|
||||||
|
) and (not can_import("gpiozero", "spidev")):
|
||||||
|
result = run_with_gauge(
|
||||||
|
"Installing event requirements...",
|
||||||
|
[pip_install("-r", str(PROGRAM_DIR / "requirements_respeaker.txt"))],
|
||||||
|
)
|
||||||
|
if not result:
|
||||||
|
error("installing event requirements")
|
||||||
|
return
|
||||||
|
|
||||||
|
generate_services(settings)
|
||||||
|
|
||||||
|
if password is None:
|
||||||
|
password = passwordbox("sudo password:")
|
||||||
|
if not password:
|
||||||
|
return
|
||||||
|
|
||||||
|
stop_services(password)
|
||||||
|
install_services(settings, password)
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
"""Constants and dataclasses."""
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from enum import Enum
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from .dataclasses_json import DataClassJsonMixin
|
||||||
|
|
||||||
|
_DIR = Path(__file__).parent
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
PROGRAM_DIR = _DIR.parent
|
||||||
|
LOCAL_DIR = PROGRAM_DIR / "local"
|
||||||
|
SETTINGS_PATH = LOCAL_DIR / "settings.json"
|
||||||
|
SERVICES_DIR = LOCAL_DIR / "services"
|
||||||
|
|
||||||
|
RECORD_SECONDS = 5
|
||||||
|
RECORD_RMS_MIN = 30
|
||||||
|
|
||||||
|
TITLE = "Wyoming Satellite"
|
||||||
|
WIDTH = "75"
|
||||||
|
HEIGHT = "20"
|
||||||
|
LIST_HEIGHT = "12"
|
||||||
|
|
||||||
|
|
||||||
|
class SatelliteType(str, Enum):
|
||||||
|
ALWAYS_STREAMING = "always"
|
||||||
|
VAD = "vad"
|
||||||
|
WAKE = "wake"
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class SatelliteSettings(DataClassJsonMixin):
|
||||||
|
name: str = "Wyoming Satellite"
|
||||||
|
type: SatelliteType = SatelliteType.ALWAYS_STREAMING
|
||||||
|
debug: bool = False
|
||||||
|
event_service_command: Optional[List[str]] = None
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class MicrophoneSettings(DataClassJsonMixin):
|
||||||
|
device: Optional[str] = None
|
||||||
|
noise_suppression: int = 0
|
||||||
|
auto_gain: int = 0
|
||||||
|
volume_multiplier: float = 1.0
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class SpeakerSettings(DataClassJsonMixin):
|
||||||
|
device: Optional[str] = None
|
||||||
|
volume_multiplier: float = 1.0
|
||||||
|
feedback_sounds: List[str] = field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class OpenWakeWordSettings(DataClassJsonMixin):
|
||||||
|
wake_word: str = "ok_nabu"
|
||||||
|
threshold: float = 0.5
|
||||||
|
trigger_level: int = 1
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Porcupine1Settings(DataClassJsonMixin):
|
||||||
|
wake_word: str = "porcupine"
|
||||||
|
sensitivity: float = 0.5
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class SnowboySettings(DataClassJsonMixin):
|
||||||
|
wake_word: str = "snowboy"
|
||||||
|
sensitivity: float = 0.5
|
||||||
|
|
||||||
|
|
||||||
|
class WakeWordSystem(str, Enum):
|
||||||
|
OPENWAKEWORD = "openWakeWord"
|
||||||
|
PORCUPINE1 = "porcupine1"
|
||||||
|
SNOWBOY = "snowboy"
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class WakeWordSettings(DataClassJsonMixin):
|
||||||
|
system: Optional[WakeWordSystem] = None
|
||||||
|
openwakeword: OpenWakeWordSettings = field(default_factory=OpenWakeWordSettings)
|
||||||
|
porcupine1: Porcupine1Settings = field(default_factory=Porcupine1Settings)
|
||||||
|
snowboy: SnowboySettings = field(default_factory=SnowboySettings)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Settings(DataClassJsonMixin):
|
||||||
|
satellite: SatelliteSettings = field(default_factory=SatelliteSettings)
|
||||||
|
mic: MicrophoneSettings = field(default_factory=MicrophoneSettings)
|
||||||
|
snd: SpeakerSettings = field(default_factory=SpeakerSettings)
|
||||||
|
wake: WakeWordSettings = field(default_factory=WakeWordSettings)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def load() -> "Settings":
|
||||||
|
if SETTINGS_PATH.exists():
|
||||||
|
_LOGGER.debug("Loading settings from %s", SETTINGS_PATH)
|
||||||
|
with open(SETTINGS_PATH, "r", encoding="utf-8") as settings_file:
|
||||||
|
settings_dict = json.load(settings_file)
|
||||||
|
return Settings.from_dict(settings_dict)
|
||||||
|
|
||||||
|
return Settings()
|
||||||
|
|
||||||
|
def save(self) -> None:
|
||||||
|
_LOGGER.debug("Saving settings to %s", SETTINGS_PATH)
|
||||||
|
|
||||||
|
settings_dict = self.to_dict()
|
||||||
|
SETTINGS_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
with open(SETTINGS_PATH, "w", encoding="utf-8") as settings_file:
|
||||||
|
json.dump(settings_dict, settings_file, ensure_ascii=False, indent=2)
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
"""Implement a tiny subset of dataclasses_json for config."""
|
||||||
|
from collections.abc import Mapping, Sequence
|
||||||
|
from dataclasses import asdict, fields, is_dataclass
|
||||||
|
from typing import Any, Dict, Type
|
||||||
|
|
||||||
|
|
||||||
|
class DataClassJsonMixin:
|
||||||
|
"""Adds from_dict to dataclass."""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, data: Dict[str, Any]) -> Any:
|
||||||
|
"""Parse dataclasses recursively."""
|
||||||
|
kwargs: Dict[str, Any] = {}
|
||||||
|
|
||||||
|
cls_fields = {field.name: field for field in fields(cls)}
|
||||||
|
for key, value in data.items():
|
||||||
|
if key not in cls_fields:
|
||||||
|
# Skip unknown fields
|
||||||
|
continue
|
||||||
|
|
||||||
|
field = cls_fields[key]
|
||||||
|
if is_dataclass(field.type):
|
||||||
|
assert issubclass(field.type, DataClassJsonMixin), field.type
|
||||||
|
kwargs[key] = field.type.from_dict(value)
|
||||||
|
else:
|
||||||
|
kwargs[key] = _decode(value, field.type)
|
||||||
|
|
||||||
|
# Fill in optional fields with None
|
||||||
|
for field in cls_fields.values():
|
||||||
|
if (field.name not in kwargs) and _is_optional(field.type):
|
||||||
|
kwargs[field.name] = None
|
||||||
|
|
||||||
|
return cls(**kwargs)
|
||||||
|
|
||||||
|
def to_dict(self) -> Dict[str, Any]:
|
||||||
|
"""Alias for asdict."""
|
||||||
|
return asdict(self)
|
||||||
|
|
||||||
|
|
||||||
|
def _decode(value: Any, target_type: Type) -> Any:
|
||||||
|
"""Decode value using (possibly generic) type."""
|
||||||
|
if is_dataclass(target_type):
|
||||||
|
assert issubclass(target_type, DataClassJsonMixin), target_type
|
||||||
|
return target_type.from_dict(value) if value is not None else None
|
||||||
|
|
||||||
|
if hasattr(target_type, "__args__"):
|
||||||
|
# Optional[T]
|
||||||
|
if type(None) in target_type.__args__:
|
||||||
|
optional_type = target_type.__args__[0]
|
||||||
|
return _decode(value, optional_type)
|
||||||
|
|
||||||
|
# List[T]
|
||||||
|
if isinstance(value, Sequence):
|
||||||
|
list_type = target_type.__args__[0]
|
||||||
|
return [_decode(item, list_type) for item in value]
|
||||||
|
|
||||||
|
# Dict[str, T]
|
||||||
|
if isinstance(value, Mapping):
|
||||||
|
value_type = target_type.__args__[1]
|
||||||
|
return {
|
||||||
|
map_key: _decode(map_value, value_type)
|
||||||
|
for map_key, map_value in value.items()
|
||||||
|
}
|
||||||
|
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def _is_optional(target_type: Type):
|
||||||
|
"""True if type is Optional"""
|
||||||
|
return hasattr(target_type, "__args__") and (type(None) in target_type.__args__)
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
"""Hardware drivers."""
|
||||||
|
import sys
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from .const import PROGRAM_DIR, Settings
|
||||||
|
from .whiptail import error, menu, msgbox, passwordbox, run_with_gauge, yesno
|
||||||
|
|
||||||
|
|
||||||
|
def install_drivers(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Drivers",
|
||||||
|
[("respeaker", "Install ReSpeaker Drivers")],
|
||||||
|
selected_item=choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "respeaker":
|
||||||
|
if yesno(
|
||||||
|
"ReSpeaker drivers for the Raspberry Pi will now be compiled and installed. "
|
||||||
|
"This will take a long time and require a reboot. "
|
||||||
|
"Continue?"
|
||||||
|
):
|
||||||
|
password = passwordbox("sudo password:")
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Installing drivers...",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"sudo",
|
||||||
|
"-S",
|
||||||
|
str(PROGRAM_DIR / "etc" / "install-respeaker-drivers.sh"),
|
||||||
|
]
|
||||||
|
],
|
||||||
|
sudo_password=password,
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
error("installing ReSpeaker drivers")
|
||||||
|
return
|
||||||
|
|
||||||
|
msgbox(
|
||||||
|
"Driver installation complete. "
|
||||||
|
"Please reboot your Raspberry Pi and re-run the installer. "
|
||||||
|
'Once rebooted, select the "seeed" microphone.'
|
||||||
|
)
|
||||||
|
|
||||||
|
sys.exit(0)
|
||||||
|
else:
|
||||||
|
break
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
"""Microphone settings."""
|
||||||
|
import array
|
||||||
|
import logging
|
||||||
|
import math
|
||||||
|
import subprocess
|
||||||
|
from concurrent.futures import Future, ThreadPoolExecutor
|
||||||
|
from typing import Dict, List, Optional
|
||||||
|
|
||||||
|
from .const import RECORD_RMS_MIN, RECORD_SECONDS, Settings
|
||||||
|
from .whiptail import gauge, inputbox, menu, msgbox, radiolist
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def configure_microphone(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = microphone_menu(choice)
|
||||||
|
|
||||||
|
if choice == "detect":
|
||||||
|
# Automatically detect microphone with hightest RMS
|
||||||
|
best_device: Optional[str] = None
|
||||||
|
best_rms: Optional[float] = None
|
||||||
|
|
||||||
|
devices = get_microphone_devices()
|
||||||
|
with ThreadPoolExecutor() as executor:
|
||||||
|
futures: Dict[str, Future] = {}
|
||||||
|
for device in devices:
|
||||||
|
futures[device] = executor.submit(_record_proc, device)
|
||||||
|
|
||||||
|
gauge("Speak loudly into the microphone.", RECORD_SECONDS)
|
||||||
|
for device, future in futures.items():
|
||||||
|
device_rms = future.result()
|
||||||
|
if device_rms is None:
|
||||||
|
_LOGGER.warning("Failed to record from microphone %s", device)
|
||||||
|
continue
|
||||||
|
|
||||||
|
_LOGGER.debug(
|
||||||
|
"Microphone %s got RMS %s (min: %s)",
|
||||||
|
device,
|
||||||
|
device_rms,
|
||||||
|
RECORD_RMS_MIN,
|
||||||
|
)
|
||||||
|
if device_rms < RECORD_RMS_MIN:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if (best_rms is None) or (device_rms > best_rms):
|
||||||
|
best_device = device
|
||||||
|
best_rms = device_rms
|
||||||
|
|
||||||
|
if best_device is not None:
|
||||||
|
msgbox(f"Successfully detected microphone: {best_device}")
|
||||||
|
settings.mic.device = best_device
|
||||||
|
settings.save()
|
||||||
|
else:
|
||||||
|
msgbox(
|
||||||
|
"Audio was not detected from any microphone.\n"
|
||||||
|
"If a satellite is currently running, you may need to stop it."
|
||||||
|
)
|
||||||
|
elif choice == "list":
|
||||||
|
# arecord -L
|
||||||
|
microphone_device = radiolist(
|
||||||
|
"Select ALSA Device:", get_microphone_devices(), settings.mic.device
|
||||||
|
)
|
||||||
|
if microphone_device:
|
||||||
|
settings.mic.device = microphone_device
|
||||||
|
settings.save()
|
||||||
|
elif choice == "manual":
|
||||||
|
microphone_device = inputbox("Enter ALSA Device:", settings.mic.device)
|
||||||
|
if microphone_device:
|
||||||
|
settings.mic.device = microphone_device
|
||||||
|
settings.save()
|
||||||
|
elif choice == "settings":
|
||||||
|
configure_audio_settings(settings)
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def microphone_menu(last_choice: Optional[str]) -> Optional[str]:
|
||||||
|
return menu(
|
||||||
|
"Main > Microphone",
|
||||||
|
[
|
||||||
|
("detect", "Autodetect"),
|
||||||
|
("list", "Select From List"),
|
||||||
|
("manual", "Enter Manually"),
|
||||||
|
("settings", "Audio Settings"),
|
||||||
|
],
|
||||||
|
selected_item=last_choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_microphone_devices() -> List[str]:
|
||||||
|
devices = []
|
||||||
|
lines = subprocess.check_output(["arecord", "-L"]).decode("utf-8").splitlines()
|
||||||
|
for line in lines:
|
||||||
|
line = line.strip()
|
||||||
|
|
||||||
|
# default = PulseAudio
|
||||||
|
if (line == "default") or line.startswith("plughw:"):
|
||||||
|
devices.append(line)
|
||||||
|
|
||||||
|
return devices
|
||||||
|
|
||||||
|
|
||||||
|
def _record_proc(device: str) -> Optional[float]:
|
||||||
|
try:
|
||||||
|
proc = subprocess.Popen(
|
||||||
|
[
|
||||||
|
"arecord",
|
||||||
|
"-q",
|
||||||
|
"-D",
|
||||||
|
device,
|
||||||
|
"-r",
|
||||||
|
"16000",
|
||||||
|
"-c",
|
||||||
|
"1",
|
||||||
|
"-f",
|
||||||
|
"S16_LE",
|
||||||
|
"-t",
|
||||||
|
"raw",
|
||||||
|
"-d",
|
||||||
|
str(RECORD_SECONDS),
|
||||||
|
],
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
audio, stderr = proc.communicate()
|
||||||
|
if proc.returncode != 0:
|
||||||
|
_LOGGER.error(
|
||||||
|
"Error recording from device %s: %s", device, stderr.decode("utf-8")
|
||||||
|
)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# 16-bit mono
|
||||||
|
audio_array = array.array("h", audio)
|
||||||
|
rms = math.sqrt(
|
||||||
|
(1 / len(audio_array) * sum(x * x for x in audio_array.tolist()))
|
||||||
|
)
|
||||||
|
return rms
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Error recording from device: %s", device)
|
||||||
|
return None
|
||||||
|
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def configure_audio_settings(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = audio_settings_menu(choice)
|
||||||
|
|
||||||
|
if choice == "noise":
|
||||||
|
noise_suppression = radiolist(
|
||||||
|
"Noise Suppression Level",
|
||||||
|
[(0, "Off"), (1, "Low"), (2, "Medium"), (3, "High"), (4, "Maximum")],
|
||||||
|
settings.mic.noise_suppression,
|
||||||
|
)
|
||||||
|
if noise_suppression is not None:
|
||||||
|
settings.mic.noise_suppression = noise_suppression
|
||||||
|
settings.save()
|
||||||
|
elif choice == "gain":
|
||||||
|
while True:
|
||||||
|
auto_gain = inputbox("Auto Gain (0-31 dbFS)", settings.mic.auto_gain)
|
||||||
|
if auto_gain is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
auto_gain_int = int(auto_gain)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if 0 <= auto_gain_int <= 31:
|
||||||
|
settings.mic.auto_gain = auto_gain_int
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Must be 0-31")
|
||||||
|
elif choice == "multiplier":
|
||||||
|
while True:
|
||||||
|
volume_multiplier = inputbox(
|
||||||
|
"Volume Multiplier (1 = default)", settings.mic.volume_multiplier
|
||||||
|
)
|
||||||
|
if volume_multiplier is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
volume_multiplier_float = float(volume_multiplier)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if volume_multiplier_float > 0:
|
||||||
|
settings.mic.volume_multiplier = volume_multiplier_float
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Must be > 0")
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def audio_settings_menu(last_choice: Optional[str]) -> Optional[str]:
|
||||||
|
return menu(
|
||||||
|
"Main > Microphone > Audio Settings",
|
||||||
|
[
|
||||||
|
("noise", "Noise Suppression"),
|
||||||
|
("gain", "Auto Gain"),
|
||||||
|
("multiplier", "Volume Multiplier"),
|
||||||
|
],
|
||||||
|
selected_item=last_choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
"""Install system packages."""
|
||||||
|
import logging
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
from .const import PROGRAM_DIR
|
||||||
|
from .whiptail import run_with_gauge
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def packages_installed(*packages) -> bool:
|
||||||
|
for package in packages:
|
||||||
|
try:
|
||||||
|
subprocess.check_call(
|
||||||
|
["dpkg", "--status", str(package)],
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def install_packages_nogui(*packages, update: bool = True) -> bool:
|
||||||
|
assert packages, "No packages"
|
||||||
|
|
||||||
|
commands = []
|
||||||
|
if update:
|
||||||
|
commands.append(["sudo", "apt-get", "update"])
|
||||||
|
|
||||||
|
commands.append(
|
||||||
|
["sudo", "apt-get", "install", "--yes"] + [str(p) for p in packages]
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
for command in commands:
|
||||||
|
subprocess.check_call(
|
||||||
|
command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Unexpected error installing packages: %s", packages)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def install_packages(
|
||||||
|
text: str, sudo_password: str, *packages, update: bool = True
|
||||||
|
) -> bool:
|
||||||
|
assert packages, "No packages"
|
||||||
|
|
||||||
|
commands = []
|
||||||
|
if update:
|
||||||
|
commands.append(["sudo", "-S", "apt-get", "update"])
|
||||||
|
|
||||||
|
commands.append(
|
||||||
|
["sudo", "-S", "apt-get", "install", "--yes"] + [str(p) for p in packages]
|
||||||
|
)
|
||||||
|
|
||||||
|
return run_with_gauge(text, commands, sudo_password=sudo_password)
|
||||||
|
|
||||||
|
|
||||||
|
def can_import(*names) -> bool:
|
||||||
|
assert names, "No names"
|
||||||
|
|
||||||
|
venv_dir = PROGRAM_DIR / ".venv"
|
||||||
|
if not venv_dir.exists():
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
import venv
|
||||||
|
except ImportError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
context = venv.EnvBuilder().ensure_directories(PROGRAM_DIR / ".venv")
|
||||||
|
|
||||||
|
try:
|
||||||
|
subprocess.check_call(
|
||||||
|
[context.env_exe, "-c", "; ".join(f"import {name}" for name in names)],
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
"""Satellite settings."""
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from .const import PROGRAM_DIR, SatelliteType, Settings
|
||||||
|
from .whiptail import error, inputbox, menu, passwordbox, radiolist, run_with_gauge
|
||||||
|
|
||||||
|
|
||||||
|
def configure_satellite(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = satellite_menu(choice)
|
||||||
|
|
||||||
|
if choice == "name":
|
||||||
|
name = inputbox("Satellite Name:", settings.satellite.name)
|
||||||
|
if name:
|
||||||
|
settings.satellite.name = name
|
||||||
|
settings.save()
|
||||||
|
elif choice == "type":
|
||||||
|
satellite_type = radiolist(
|
||||||
|
"Satellite Type:",
|
||||||
|
[
|
||||||
|
(SatelliteType.ALWAYS_STREAMING, "Always streaming"),
|
||||||
|
(SatelliteType.VAD, "Voice activity detection"),
|
||||||
|
(SatelliteType.WAKE, "Local wake word detection"),
|
||||||
|
],
|
||||||
|
settings.satellite.type,
|
||||||
|
)
|
||||||
|
|
||||||
|
if satellite_type is not None:
|
||||||
|
settings.satellite.type = SatelliteType(satellite_type)
|
||||||
|
settings.save()
|
||||||
|
elif choice == "feedback":
|
||||||
|
configure_feedback(settings)
|
||||||
|
elif choice in ("restart", "stop", "start"):
|
||||||
|
password = passwordbox("sudo password:")
|
||||||
|
if not password:
|
||||||
|
continue
|
||||||
|
|
||||||
|
command = ["sudo", "-S", "systemctl", choice, "wyoming-satellite.service"]
|
||||||
|
text = {"restart": "Restarting", "stop": "Stopping", "start": "Starting"}[
|
||||||
|
choice
|
||||||
|
]
|
||||||
|
success = run_with_gauge(
|
||||||
|
f"{text} satellite...", [command], sudo_password=password
|
||||||
|
)
|
||||||
|
if not success:
|
||||||
|
error(f"{text.lower()} satellite")
|
||||||
|
elif choice == "debug":
|
||||||
|
debug = radiolist(
|
||||||
|
"Debug Mode:",
|
||||||
|
[
|
||||||
|
("disabled", "Disabled"),
|
||||||
|
("enabled", "Enabled"),
|
||||||
|
],
|
||||||
|
"enabled" if settings.satellite.debug else "disabled",
|
||||||
|
)
|
||||||
|
|
||||||
|
if debug is not None:
|
||||||
|
settings.satellite.debug = debug == "enabled"
|
||||||
|
settings.save()
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def satellite_menu(last_choice: Optional[str]) -> Optional[str]:
|
||||||
|
return menu(
|
||||||
|
"Main > Satellite",
|
||||||
|
[
|
||||||
|
("name", "Satellite Name"),
|
||||||
|
("type", "Satellite Type"),
|
||||||
|
("feedback", "Feedback"),
|
||||||
|
("restart", "Restart Services"),
|
||||||
|
("stop", "Stop Services"),
|
||||||
|
("start", "Start Services"),
|
||||||
|
("debug", "Set Debug Mode"),
|
||||||
|
],
|
||||||
|
selected_item=last_choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_feedback(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Satellite > Feedback",
|
||||||
|
[("respeaker", "ReSpeaker")],
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
if choice == "respeaker":
|
||||||
|
selected_service: Optional[str] = None
|
||||||
|
if settings.satellite.event_service_command:
|
||||||
|
if "2mic" in settings.satellite.event_service_command[0]:
|
||||||
|
selected_service = "2mic"
|
||||||
|
elif "4mic" in settings.satellite.event_service_command[0]:
|
||||||
|
selected_service = "4mic"
|
||||||
|
|
||||||
|
event_service = radiolist(
|
||||||
|
"Event Service:",
|
||||||
|
[
|
||||||
|
("none", "None"),
|
||||||
|
("2mic", "2mic LEDs"),
|
||||||
|
("4mic", "4mic LEDs"),
|
||||||
|
],
|
||||||
|
selected_service,
|
||||||
|
)
|
||||||
|
|
||||||
|
if event_service is not None:
|
||||||
|
if event_service == "none":
|
||||||
|
settings.satellite.event_service_command = None
|
||||||
|
else:
|
||||||
|
settings.satellite.event_service_command = [
|
||||||
|
str(PROGRAM_DIR / "script" / f"run_{event_service}"),
|
||||||
|
"--uri",
|
||||||
|
"tcp://127.0.0.1:10500",
|
||||||
|
]
|
||||||
|
|
||||||
|
settings.save()
|
||||||
|
else:
|
||||||
|
break
|
||||||
@@ -0,0 +1,262 @@
|
|||||||
|
"""Systemd service management."""
|
||||||
|
import shlex
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
from .const import (
|
||||||
|
LOCAL_DIR,
|
||||||
|
PROGRAM_DIR,
|
||||||
|
SERVICES_DIR,
|
||||||
|
SatelliteType,
|
||||||
|
Settings,
|
||||||
|
WakeWordSystem,
|
||||||
|
)
|
||||||
|
from .whiptail import error, msgbox, run_with_gauge
|
||||||
|
|
||||||
|
|
||||||
|
def stop_services(password: str) -> None:
|
||||||
|
stop_commands = []
|
||||||
|
for service in ("satellite", "wakeword", "event"):
|
||||||
|
service_filename = f"wyoming-{service}.service"
|
||||||
|
service_path = Path("/etc/systemd/system") / service_filename
|
||||||
|
if not service_path.exists():
|
||||||
|
continue
|
||||||
|
|
||||||
|
stop_commands.append(["sudo", "-S", "systemctl", "stop", service_filename])
|
||||||
|
stop_commands.append(["sudo", "-S", "systemctl", "disable", service_filename])
|
||||||
|
|
||||||
|
run_with_gauge("Stopping Services...", stop_commands, sudo_password=password)
|
||||||
|
|
||||||
|
|
||||||
|
def generate_services(settings: Settings) -> None:
|
||||||
|
SERVICES_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
user_id = subprocess.check_output(["id", "-u"], text=True).strip()
|
||||||
|
user_name = subprocess.check_output(["id", "--name", "-u"], text=True).strip()
|
||||||
|
|
||||||
|
satellite_command: List[str] = [
|
||||||
|
str(PROGRAM_DIR / "script" / "run"),
|
||||||
|
"--name",
|
||||||
|
settings.satellite.name,
|
||||||
|
"--uri",
|
||||||
|
"tcp://0.0.0.0:10700",
|
||||||
|
"--mic-command",
|
||||||
|
f"arecord -D {settings.mic.device} -q -r 16000 -c 1 -f S16_LE -t raw",
|
||||||
|
]
|
||||||
|
satellite_requires: List[str] = []
|
||||||
|
|
||||||
|
if settings.snd.device is not None:
|
||||||
|
# Audio output
|
||||||
|
satellite_command.extend(
|
||||||
|
[
|
||||||
|
"--snd-command",
|
||||||
|
f"aplay -D {settings.snd.device} -q -r 22050 -c 1 -f S16_LE -t raw",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
if settings.snd.volume_multiplier != 1.0:
|
||||||
|
satellite_command.extend(
|
||||||
|
["--snd-volume-multiplier", str(settings.snd.volume_multiplier)]
|
||||||
|
)
|
||||||
|
|
||||||
|
for sound_name in settings.snd.feedback_sounds:
|
||||||
|
# Try local/sounds first
|
||||||
|
sound_path = LOCAL_DIR / "sounds" / f"{sound_name}.wav"
|
||||||
|
if not sound_path.exists():
|
||||||
|
sound_path = PROGRAM_DIR / "sounds" / f"{sound_name}.wav"
|
||||||
|
|
||||||
|
satellite_command.extend([f"--{sound_name}-wav", str(sound_path)])
|
||||||
|
|
||||||
|
if settings.mic.noise_suppression > 0:
|
||||||
|
satellite_command.extend(
|
||||||
|
["--mic-noise-suppression", str(settings.mic.noise_suppression)]
|
||||||
|
)
|
||||||
|
|
||||||
|
if settings.mic.auto_gain > 0:
|
||||||
|
satellite_command.extend(["--mic-auto-gain", str(settings.mic.auto_gain)])
|
||||||
|
|
||||||
|
if settings.mic.volume_multiplier != 1.0:
|
||||||
|
satellite_command.extend(
|
||||||
|
["--mic-volume-multiplier", str(settings.mic.volume_multiplier)]
|
||||||
|
)
|
||||||
|
|
||||||
|
if settings.satellite.type == SatelliteType.VAD:
|
||||||
|
# Voice activity detect
|
||||||
|
satellite_command.append("--vad")
|
||||||
|
elif settings.satellite.type == SatelliteType.WAKE:
|
||||||
|
# Local wake word detection
|
||||||
|
assert settings.wake.system is not None, "Wake word system not set"
|
||||||
|
|
||||||
|
wake_word_service = "wyoming-wakeword"
|
||||||
|
wake_word_dir = LOCAL_DIR / (
|
||||||
|
"wyoming-" + WakeWordSystem(settings.wake.system).value.lower()
|
||||||
|
)
|
||||||
|
wake_word_command = [
|
||||||
|
str(wake_word_dir / "script" / "run"),
|
||||||
|
"--uri",
|
||||||
|
"tcp://127.0.0.1:10400",
|
||||||
|
]
|
||||||
|
|
||||||
|
if settings.wake.system == WakeWordSystem.OPENWAKEWORD:
|
||||||
|
wake_word = settings.wake.openwakeword.wake_word
|
||||||
|
wake_word_command.extend(
|
||||||
|
[
|
||||||
|
"--threshold",
|
||||||
|
str(settings.wake.openwakeword.threshold),
|
||||||
|
"--trigger-level",
|
||||||
|
str(settings.wake.openwakeword.trigger_level),
|
||||||
|
"--custom-model-dir",
|
||||||
|
str(LOCAL_DIR / "custom-wake-words" / "openWakeWord"),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
elif settings.wake.system == WakeWordSystem.PORCUPINE1:
|
||||||
|
wake_word = settings.wake.porcupine1.wake_word
|
||||||
|
wake_word_command.extend(
|
||||||
|
["--sensitivity", str(settings.wake.porcupine1.sensitivity)]
|
||||||
|
)
|
||||||
|
elif settings.wake.system == WakeWordSystem.SNOWBOY:
|
||||||
|
wake_word = settings.wake.snowboy.wake_word
|
||||||
|
wake_word_command.extend(
|
||||||
|
[
|
||||||
|
"--sensitivity",
|
||||||
|
str(settings.wake.snowboy.sensitivity),
|
||||||
|
"--custom-model-dir",
|
||||||
|
str(LOCAL_DIR / "custom-wake-words" / "snowboy"),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise ValueError(settings.wake.system)
|
||||||
|
|
||||||
|
if settings.satellite.debug:
|
||||||
|
wake_word_command.append("--debug")
|
||||||
|
|
||||||
|
wake_word_command_str = shlex.join(wake_word_command)
|
||||||
|
|
||||||
|
with open(
|
||||||
|
SERVICES_DIR / f"{wake_word_service}.service", "w", encoding="utf-8"
|
||||||
|
) as service_file:
|
||||||
|
print("[Unit]", file=service_file)
|
||||||
|
print(
|
||||||
|
f"Description={WakeWordSystem(settings.wake.system).value}",
|
||||||
|
file=service_file,
|
||||||
|
)
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Service]", file=service_file)
|
||||||
|
print("Type=simple", file=service_file)
|
||||||
|
print(f"User={user_name}", file=service_file)
|
||||||
|
print(f"ExecStart={wake_word_command_str}", file=service_file)
|
||||||
|
print(f"WorkingDirectory={wake_word_dir}", file=service_file)
|
||||||
|
print("Restart=always", file=service_file)
|
||||||
|
print("RestartSec=1", file=service_file)
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Install]", file=service_file)
|
||||||
|
print("WantedBy=default.target", file=service_file)
|
||||||
|
|
||||||
|
satellite_command.extend(
|
||||||
|
[
|
||||||
|
"--wake-uri",
|
||||||
|
"tcp://127.0.0.1:10400",
|
||||||
|
"--wake-word-name",
|
||||||
|
wake_word,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
satellite_requires.append(f"{wake_word_service}.service")
|
||||||
|
|
||||||
|
if settings.satellite.event_service_command:
|
||||||
|
event_service = "wyoming-event"
|
||||||
|
event_command_str = shlex.join(settings.satellite.event_service_command)
|
||||||
|
with open(
|
||||||
|
SERVICES_DIR / f"{event_service}.service", "w", encoding="utf-8"
|
||||||
|
) as service_file:
|
||||||
|
print("[Unit]", file=service_file)
|
||||||
|
print("Description=Event service", file=service_file)
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Service]", file=service_file)
|
||||||
|
print("Type=simple", file=service_file)
|
||||||
|
print(f"User={user_name}", file=service_file)
|
||||||
|
print(f"ExecStart={event_command_str}", file=service_file)
|
||||||
|
print(f"WorkingDirectory={PROGRAM_DIR}", file=service_file)
|
||||||
|
print("Restart=always", file=service_file)
|
||||||
|
print("RestartSec=1", file=service_file)
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Install]", file=service_file)
|
||||||
|
print("WantedBy=default.target", file=service_file)
|
||||||
|
|
||||||
|
satellite_command.extend(["--event-uri", "tcp://127.0.0.1:10500"])
|
||||||
|
satellite_requires.append(f"{event_service}.service")
|
||||||
|
|
||||||
|
if settings.satellite.debug:
|
||||||
|
satellite_command.extend(
|
||||||
|
["--debug", "--debug-recording-dir", str(LOCAL_DIR / "debug-recording")]
|
||||||
|
)
|
||||||
|
|
||||||
|
satellite_command_str = shlex.join(satellite_command)
|
||||||
|
|
||||||
|
with open(
|
||||||
|
SERVICES_DIR / "wyoming-satellite.service", "w", encoding="utf-8"
|
||||||
|
) as service_file:
|
||||||
|
print("[Unit]", file=service_file)
|
||||||
|
print("Description=Wyoming Satellite", file=service_file)
|
||||||
|
print("Wants=network-online.target", file=service_file)
|
||||||
|
print("After=network-online.target", file=service_file)
|
||||||
|
for requires in satellite_requires:
|
||||||
|
print(f"Requires={requires}", file=service_file)
|
||||||
|
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Service]", file=service_file)
|
||||||
|
print("Type=simple", file=service_file)
|
||||||
|
print(f"User={user_name}", file=service_file)
|
||||||
|
|
||||||
|
# For PulseAudio
|
||||||
|
print(f"Environment=XDG_RUNTIME_DIR=/run/user/{user_id}", file=service_file)
|
||||||
|
|
||||||
|
print(f"ExecStart={satellite_command_str}", file=service_file)
|
||||||
|
print(f"WorkingDirectory={PROGRAM_DIR}", file=service_file)
|
||||||
|
print("Restart=always", file=service_file)
|
||||||
|
print("RestartSec=1", file=service_file)
|
||||||
|
print("", file=service_file)
|
||||||
|
print("[Install]", file=service_file)
|
||||||
|
print("WantedBy=default.target", file=service_file)
|
||||||
|
|
||||||
|
|
||||||
|
def install_services(settings: Settings, password: str):
|
||||||
|
# Install and run
|
||||||
|
installed_services = ["satellite"]
|
||||||
|
if settings.satellite.type == SatelliteType.WAKE:
|
||||||
|
assert settings.wake.system is not None, "No wake word system"
|
||||||
|
installed_services.append("wakeword")
|
||||||
|
|
||||||
|
if settings.satellite.event_service_command:
|
||||||
|
installed_services.append("event")
|
||||||
|
|
||||||
|
install_commands = []
|
||||||
|
for service in installed_services:
|
||||||
|
service_filename = f"wyoming-{service}.service"
|
||||||
|
install_commands.append(
|
||||||
|
[
|
||||||
|
"sudo",
|
||||||
|
"-S",
|
||||||
|
"cp",
|
||||||
|
str(SERVICES_DIR / service_filename),
|
||||||
|
"/etc/systemd/system/",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
install_commands.append(["sudo", "-S", "systemctl", "daemon-reload"])
|
||||||
|
|
||||||
|
# Copy first, then enable and start
|
||||||
|
for service in installed_services:
|
||||||
|
install_commands.append(["sudo", "-S", "systemctl", "enable", service_filename])
|
||||||
|
|
||||||
|
install_commands.append(
|
||||||
|
["sudo", "-S", "systemctl", "enable", "--now", "wyoming-satellite.service"]
|
||||||
|
)
|
||||||
|
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Installing Services...", install_commands, sudo_password=password
|
||||||
|
)
|
||||||
|
if success:
|
||||||
|
msgbox("Successfully installed services")
|
||||||
|
else:
|
||||||
|
error("installing services")
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
"""Speaker settings."""
|
||||||
|
import logging
|
||||||
|
import subprocess
|
||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from .const import PROGRAM_DIR, Settings
|
||||||
|
from .whiptail import checklist, inputbox, menu, msgbox, radiolist
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def configure_speakers(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = speakers_menu(choice)
|
||||||
|
|
||||||
|
if choice == "play":
|
||||||
|
if settings.snd.device is None:
|
||||||
|
msgbox("No speaker device set")
|
||||||
|
continue
|
||||||
|
|
||||||
|
test_sound_device(settings.snd.device)
|
||||||
|
elif choice == "test":
|
||||||
|
sound_device = test_speakers()
|
||||||
|
if sound_device is not None:
|
||||||
|
settings.snd.device = sound_device
|
||||||
|
settings.save()
|
||||||
|
elif choice == "list":
|
||||||
|
sound_device = radiolist(
|
||||||
|
"Select ALSA Device:",
|
||||||
|
get_sound_devices(),
|
||||||
|
settings.snd.device,
|
||||||
|
)
|
||||||
|
if sound_device:
|
||||||
|
settings.snd.device = sound_device
|
||||||
|
settings.save()
|
||||||
|
elif choice == "manual":
|
||||||
|
sound_device = inputbox("Enter ALSA Device:", settings.snd.device)
|
||||||
|
if sound_device:
|
||||||
|
settings.snd.device = sound_device
|
||||||
|
settings.save()
|
||||||
|
elif choice == "disable":
|
||||||
|
settings.snd.device = None
|
||||||
|
settings.save()
|
||||||
|
msgbox("Sound disabled")
|
||||||
|
elif choice == "feedback":
|
||||||
|
feedback_sounds = checklist(
|
||||||
|
"Enabled Sounds:",
|
||||||
|
[("awake", "On wake-up"), ("done", "After voice command")],
|
||||||
|
settings.snd.feedback_sounds,
|
||||||
|
)
|
||||||
|
|
||||||
|
if feedback_sounds is not None:
|
||||||
|
settings.snd.feedback_sounds = feedback_sounds
|
||||||
|
settings.save()
|
||||||
|
elif choice == "multiplier":
|
||||||
|
while True:
|
||||||
|
volume_multiplier = inputbox(
|
||||||
|
"Volume Multiplier (1 = default)", settings.snd.volume_multiplier
|
||||||
|
)
|
||||||
|
if volume_multiplier is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
volume_multiplier_float = float(volume_multiplier)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if volume_multiplier_float > 0:
|
||||||
|
settings.snd.volume_multiplier = volume_multiplier_float
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Must be > 0")
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def speakers_menu(last_choice: Optional[str]) -> Optional[str]:
|
||||||
|
return menu(
|
||||||
|
"Main > Speakers",
|
||||||
|
[
|
||||||
|
("play", "Play Sound"),
|
||||||
|
("test", "Test All Speakers"),
|
||||||
|
("list", "Select From List"),
|
||||||
|
("manual", "Enter Manually"),
|
||||||
|
("disable", "Disable Sound"),
|
||||||
|
("multiplier", "Volume Multiplier"),
|
||||||
|
("feedback", "Toggle Feedback Sounds"),
|
||||||
|
],
|
||||||
|
selected_item=last_choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_sound_devices() -> List[str]:
|
||||||
|
devices = []
|
||||||
|
lines = subprocess.check_output(["aplay", "-L"]).decode("utf-8").splitlines()
|
||||||
|
for line in lines:
|
||||||
|
line = line.strip()
|
||||||
|
|
||||||
|
# default = PulseAudio
|
||||||
|
if (line == "default") or line.startswith("plughw:"):
|
||||||
|
devices.append(line)
|
||||||
|
|
||||||
|
return devices
|
||||||
|
|
||||||
|
|
||||||
|
def test_speakers() -> Optional[str]:
|
||||||
|
devices = get_sound_devices()
|
||||||
|
if not devices:
|
||||||
|
msgbox("No speakers found")
|
||||||
|
return None
|
||||||
|
|
||||||
|
device = devices.pop()
|
||||||
|
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
f"Device: {device}",
|
||||||
|
[
|
||||||
|
("play", "Play Sound"),
|
||||||
|
("next", "Next Device"),
|
||||||
|
("choose", "Choose This Device"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "play":
|
||||||
|
test_sound_device(device)
|
||||||
|
elif choice == "next":
|
||||||
|
if not devices:
|
||||||
|
msgbox("No more devices")
|
||||||
|
break
|
||||||
|
|
||||||
|
device = devices.pop()
|
||||||
|
elif choice == "choose":
|
||||||
|
return device
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def test_sound_device(device: str) -> None:
|
||||||
|
try:
|
||||||
|
subprocess.check_call(
|
||||||
|
["aplay", "-q", "-D", device, str(PROGRAM_DIR / "sounds" / "awake.wav")]
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Error testing device: %s", device)
|
||||||
@@ -0,0 +1,468 @@
|
|||||||
|
"""Wake word settings."""
|
||||||
|
import itertools
|
||||||
|
import re
|
||||||
|
import shutil
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Dict, Optional
|
||||||
|
|
||||||
|
from .const import LOCAL_DIR, SatelliteType, Settings, WakeWordSystem
|
||||||
|
from .packages import install_packages, packages_installed
|
||||||
|
from .whiptail import (
|
||||||
|
error,
|
||||||
|
inputbox,
|
||||||
|
menu,
|
||||||
|
msgbox,
|
||||||
|
passwordbox,
|
||||||
|
radiolist,
|
||||||
|
run_with_gauge,
|
||||||
|
yesno,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_wake_word(settings: Settings) -> None:
|
||||||
|
if settings.satellite.type != SatelliteType.WAKE:
|
||||||
|
if not yesno("Set satellite type to local wake word?"):
|
||||||
|
return
|
||||||
|
|
||||||
|
settings.satellite.type = SatelliteType.WAKE
|
||||||
|
settings.save()
|
||||||
|
|
||||||
|
def star(ww_system: WakeWordSystem) -> str:
|
||||||
|
return (
|
||||||
|
f"{ww_system.value} [*]"
|
||||||
|
if settings.wake.system == ww_system
|
||||||
|
else ww_system.value
|
||||||
|
)
|
||||||
|
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Wake Word",
|
||||||
|
[
|
||||||
|
("system", "Wake Word System"),
|
||||||
|
("wake_word", "Choose Wake Word"),
|
||||||
|
("openWakeWord", star(WakeWordSystem.OPENWAKEWORD)),
|
||||||
|
("porcupine1", star(WakeWordSystem.PORCUPINE1)),
|
||||||
|
("snowboy", star(WakeWordSystem.SNOWBOY)),
|
||||||
|
],
|
||||||
|
selected_item=choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "system":
|
||||||
|
wake_word_system = radiolist(
|
||||||
|
"Wake Word System:",
|
||||||
|
[v.value for v in WakeWordSystem],
|
||||||
|
settings.wake.system,
|
||||||
|
)
|
||||||
|
if wake_word_system is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
wake_word_system = WakeWordSystem(wake_word_system)
|
||||||
|
install_wake_word(settings, wake_word_system)
|
||||||
|
elif choice == "wake_word":
|
||||||
|
select_wake_word(settings)
|
||||||
|
elif choice == "openWakeWord":
|
||||||
|
configure_openWakeWord(settings)
|
||||||
|
elif choice == "porcupine1":
|
||||||
|
configure_porcupine1(settings)
|
||||||
|
elif choice == "snowboy":
|
||||||
|
configure_snowboy(settings)
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def install_wake_word(settings: Settings, wake_word_system: WakeWordSystem) -> None:
|
||||||
|
if wake_word_system == WakeWordSystem.OPENWAKEWORD:
|
||||||
|
oww_dir = LOCAL_DIR / "wyoming-openwakeword"
|
||||||
|
if not oww_dir.exists():
|
||||||
|
if not yesno("Install openWakeWord?"):
|
||||||
|
return
|
||||||
|
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Installing openWakeWord",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"clone",
|
||||||
|
"https://github.com/rhasspy/wyoming-openwakeword.git",
|
||||||
|
str(oww_dir),
|
||||||
|
],
|
||||||
|
[str(oww_dir / "script" / "setup")],
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
# Clean up
|
||||||
|
try:
|
||||||
|
shutil.rmtree(oww_dir)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
error("installing openWakeWord")
|
||||||
|
return
|
||||||
|
|
||||||
|
msgbox("openWakeWord installed successfully")
|
||||||
|
settings.wake.system = wake_word_system
|
||||||
|
settings.save()
|
||||||
|
return
|
||||||
|
|
||||||
|
if wake_word_system == WakeWordSystem.PORCUPINE1:
|
||||||
|
porcupine1_dir = LOCAL_DIR / "wyoming-porcupine1"
|
||||||
|
if not porcupine1_dir.exists():
|
||||||
|
if not yesno("Install porcupine1?"):
|
||||||
|
return
|
||||||
|
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Installing porcupine1",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"clone",
|
||||||
|
"https://github.com/rhasspy/wyoming-porcupine1.git",
|
||||||
|
str(porcupine1_dir),
|
||||||
|
],
|
||||||
|
[str(porcupine1_dir / "script" / "setup")],
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
# Clean up
|
||||||
|
try:
|
||||||
|
shutil.rmtree(porcupine1_dir)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
error("installing porcupine1")
|
||||||
|
return
|
||||||
|
|
||||||
|
msgbox("porcupine1 installed successfully")
|
||||||
|
settings.wake.system = wake_word_system
|
||||||
|
settings.save()
|
||||||
|
return
|
||||||
|
|
||||||
|
if wake_word_system == WakeWordSystem.SNOWBOY:
|
||||||
|
snowboy_dir = LOCAL_DIR / "wyoming-snowboy"
|
||||||
|
if not snowboy_dir.exists():
|
||||||
|
if not yesno("Install snowboy?"):
|
||||||
|
return
|
||||||
|
|
||||||
|
snowboy_packages = ["python3-dev", "swig", "libatlas-base-dev"]
|
||||||
|
if not packages_installed(*snowboy_packages):
|
||||||
|
password = passwordbox("sudo password:")
|
||||||
|
if not password:
|
||||||
|
return
|
||||||
|
|
||||||
|
success = install_packages(
|
||||||
|
"Installing system packages...", password, *snowboy_packages
|
||||||
|
)
|
||||||
|
if not success:
|
||||||
|
error("installing " + ", ".join(snowboy_packages))
|
||||||
|
return
|
||||||
|
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Installing snowboy",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"clone",
|
||||||
|
"https://github.com/rhasspy/wyoming-snowboy.git",
|
||||||
|
str(snowboy_dir),
|
||||||
|
],
|
||||||
|
[str(snowboy_dir / "script" / "setup")],
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
# Clean up
|
||||||
|
try:
|
||||||
|
shutil.rmtree(snowboy_dir)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
error("installing snowboy")
|
||||||
|
return
|
||||||
|
|
||||||
|
msgbox("snowboy installed successfully")
|
||||||
|
settings.wake.system = wake_word_system
|
||||||
|
settings.save()
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def select_wake_word(settings: Settings) -> None:
|
||||||
|
if settings.wake.system == WakeWordSystem.OPENWAKEWORD:
|
||||||
|
oww_dir = LOCAL_DIR / "wyoming-openwakeword"
|
||||||
|
if not oww_dir.exists():
|
||||||
|
msgbox("openWakeWord is not installed")
|
||||||
|
return
|
||||||
|
|
||||||
|
custom_wake_word_dir = LOCAL_DIR / "custom-wake-words" / "openWakeWord"
|
||||||
|
custom_wake_word_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
community_wake_word_dir = LOCAL_DIR / "home-assistant-wakewords-collection"
|
||||||
|
|
||||||
|
while True:
|
||||||
|
ww_paths: Dict[str, Path] = {
|
||||||
|
p.stem: p for p in custom_wake_word_dir.glob("*.tflite")
|
||||||
|
}
|
||||||
|
|
||||||
|
for ww_path in community_wake_word_dir.rglob("*.tflite"):
|
||||||
|
ww_name = ww_path.stem
|
||||||
|
if ww_name in ww_paths:
|
||||||
|
continue
|
||||||
|
|
||||||
|
ww_paths[ww_name] = ww_path
|
||||||
|
|
||||||
|
for ww_path in (oww_dir / "wyoming_openwakeword" / "models").glob(
|
||||||
|
"*.tflite"
|
||||||
|
):
|
||||||
|
if not re.match("^.+_v[0-9].*$", ww_path.stem):
|
||||||
|
continue
|
||||||
|
|
||||||
|
ww_name = ww_path.stem.rsplit("_", maxsplit=1)[0]
|
||||||
|
if ww_name in ww_paths:
|
||||||
|
continue
|
||||||
|
|
||||||
|
ww_paths[ww_name] = ww_path
|
||||||
|
|
||||||
|
items = sorted(list(ww_paths.keys()))
|
||||||
|
wake_word = radiolist(
|
||||||
|
"Wake Word:", items, settings.wake.openwakeword.wake_word
|
||||||
|
)
|
||||||
|
if wake_word is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
wake_word_path = ww_paths[wake_word]
|
||||||
|
if wake_word_path.is_relative_to(community_wake_word_dir):
|
||||||
|
# Copy to custom directory
|
||||||
|
shutil.copy(wake_word_path, custom_wake_word_dir)
|
||||||
|
|
||||||
|
settings.wake.openwakeword.wake_word = wake_word
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
|
if settings.wake.system == WakeWordSystem.PORCUPINE1:
|
||||||
|
porcupine1_dir = LOCAL_DIR / "wyoming-porcupine1"
|
||||||
|
if not porcupine1_dir.exists():
|
||||||
|
msgbox("porcupine1 is not installed")
|
||||||
|
return
|
||||||
|
|
||||||
|
ww_names = sorted(
|
||||||
|
list(
|
||||||
|
set(
|
||||||
|
p.stem.rsplit("_", maxsplit=1)[0]
|
||||||
|
for p in (
|
||||||
|
porcupine1_dir / "wyoming_porcupine1" / "data" / "resources"
|
||||||
|
).rglob("*.ppn")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
wake_word = radiolist(
|
||||||
|
"Wake Word:", ww_names, settings.wake.porcupine1.wake_word
|
||||||
|
)
|
||||||
|
if wake_word is not None:
|
||||||
|
settings.wake.porcupine1.wake_word = wake_word
|
||||||
|
settings.save()
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
|
if settings.wake.system == WakeWordSystem.SNOWBOY:
|
||||||
|
snowboy_dir = LOCAL_DIR / "wyoming-snowboy"
|
||||||
|
if not snowboy_dir.exists():
|
||||||
|
msgbox("snowboy is not installed")
|
||||||
|
return
|
||||||
|
|
||||||
|
custom_wake_word_dir = LOCAL_DIR / "custom-wake-words" / "snowboy"
|
||||||
|
custom_wake_word_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
builtin_wake_words = (snowboy_dir / "wyoming_snowboy" / "data").glob("*.umdl")
|
||||||
|
custom_wake_words = itertools.chain(
|
||||||
|
custom_wake_word_dir.glob("*.pmdl"), custom_wake_word_dir.glob("*.umdl")
|
||||||
|
)
|
||||||
|
ww_names = sorted(
|
||||||
|
list(
|
||||||
|
set(
|
||||||
|
p.stem
|
||||||
|
for p in itertools.chain(builtin_wake_words, custom_wake_words)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
wake_word = radiolist("Wake Word:", ww_names, settings.wake.snowboy.wake_word)
|
||||||
|
if wake_word is not None:
|
||||||
|
settings.wake.snowboy.wake_word = wake_word
|
||||||
|
settings.save()
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def configure_openWakeWord(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Wake Word > openWakeWord",
|
||||||
|
[
|
||||||
|
("community", "Download Community Wake Words"),
|
||||||
|
("threshold", "Set Threshold"),
|
||||||
|
("trigger_level", "Set Trigger Level"),
|
||||||
|
],
|
||||||
|
selected_item=choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "community":
|
||||||
|
community_wake_word_dir = LOCAL_DIR / "home-assistant-wakewords-collection"
|
||||||
|
|
||||||
|
if not community_wake_word_dir.exists():
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Downloading community wake words...",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"clone",
|
||||||
|
"https://github.com/fwartner/home-assistant-wakewords-collection.git",
|
||||||
|
str(community_wake_word_dir),
|
||||||
|
]
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
error("downloading community wake words")
|
||||||
|
else:
|
||||||
|
success = run_with_gauge(
|
||||||
|
"Updating community wake words...",
|
||||||
|
[
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"-C",
|
||||||
|
str(community_wake_word_dir),
|
||||||
|
"pull",
|
||||||
|
"origin",
|
||||||
|
"main",
|
||||||
|
]
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
if not success:
|
||||||
|
error("updating community wake words")
|
||||||
|
elif choice == "threshold":
|
||||||
|
while True:
|
||||||
|
threshold = inputbox(
|
||||||
|
"Threshold (0-1, 0.5 = default):",
|
||||||
|
settings.wake.openwakeword.threshold,
|
||||||
|
)
|
||||||
|
if threshold is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
threshold_float = float(threshold)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if 0 < threshold_float < 1:
|
||||||
|
settings.wake.openwakeword.threshold = threshold_float
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Threshold must be in (0, 1)")
|
||||||
|
elif choice == "trigger_level":
|
||||||
|
while True:
|
||||||
|
trigger_level = inputbox(
|
||||||
|
"Trigger Level (> 0, 1 = default):",
|
||||||
|
settings.wake.openwakeword.trigger_level,
|
||||||
|
)
|
||||||
|
if trigger_level is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
trigger_level_int = int(trigger_level)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if trigger_level_int > 0:
|
||||||
|
settings.wake.openwakeword.trigger_level = trigger_level_int
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Trigger level must be > 0")
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def configure_porcupine1(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Wake Word > porcupine1",
|
||||||
|
[
|
||||||
|
("sensitivity", "Set Sensitivity"),
|
||||||
|
],
|
||||||
|
selected_item=choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "sensitivity":
|
||||||
|
while True:
|
||||||
|
sensitivity = inputbox(
|
||||||
|
"Sensitivity (0-1, 0.5 = default):",
|
||||||
|
settings.wake.porcupine1.sensitivity,
|
||||||
|
)
|
||||||
|
if sensitivity is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
sensitivity_float = float(sensitivity)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if 0 < sensitivity_float < 1:
|
||||||
|
settings.wake.porcupine1.sensitivity = sensitivity_float
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Sensitivity must be in (0, 1)")
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
def configure_snowboy(settings: Settings) -> None:
|
||||||
|
choice: Optional[str] = None
|
||||||
|
while True:
|
||||||
|
choice = menu(
|
||||||
|
"Main > Wake Word > snowboy",
|
||||||
|
[
|
||||||
|
("sensitivity", "Set Sensitivity"),
|
||||||
|
],
|
||||||
|
selected_item=choice,
|
||||||
|
menu_args=["--ok-button", "Select", "--cancel-button", "Back"],
|
||||||
|
)
|
||||||
|
|
||||||
|
if choice == "sensitivity":
|
||||||
|
while True:
|
||||||
|
sensitivity = inputbox(
|
||||||
|
"Sensitivity (0-1, 0.5 = default):",
|
||||||
|
settings.wake.snowboy.sensitivity,
|
||||||
|
)
|
||||||
|
if sensitivity is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
sensitivity_float = float(sensitivity)
|
||||||
|
except ValueError:
|
||||||
|
msgbox("Invalid value")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if 0 < sensitivity_float < 1:
|
||||||
|
settings.wake.snowboy.sensitivity = sensitivity_float
|
||||||
|
settings.save()
|
||||||
|
break
|
||||||
|
|
||||||
|
msgbox("Sensitivity must be in (0, 1)")
|
||||||
|
else:
|
||||||
|
break
|
||||||
@@ -0,0 +1,253 @@
|
|||||||
|
"""Python interface to whiptail command."""
|
||||||
|
import logging
|
||||||
|
import shlex
|
||||||
|
import subprocess
|
||||||
|
import time
|
||||||
|
from collections.abc import Sequence
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
from typing import Any, Dict, List, Optional, Tuple, Union
|
||||||
|
|
||||||
|
from .const import HEIGHT, LIST_HEIGHT, TITLE, WIDTH
|
||||||
|
|
||||||
|
ItemType = Union[str, Tuple[Any, str]]
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def whiptail(*args) -> Optional[str]:
|
||||||
|
proc = subprocess.Popen(
|
||||||
|
["whiptail", "--title", TITLE] + list(args),
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
|
||||||
|
_stdout, stderr = proc.communicate()
|
||||||
|
if proc.returncode != 0:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return stderr.decode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
|
def menu(
|
||||||
|
text: str,
|
||||||
|
items: Sequence[ItemType],
|
||||||
|
selected_item: Optional[str] = None,
|
||||||
|
menu_args: Optional[Sequence[str]] = None,
|
||||||
|
) -> Optional[str]:
|
||||||
|
assert items, "No items"
|
||||||
|
|
||||||
|
item_map: Dict[Optional[str], str] = {}
|
||||||
|
item_args: List[str] = []
|
||||||
|
selected_tag: Optional[str] = None
|
||||||
|
for i, item in enumerate(items):
|
||||||
|
item_id = str(i)
|
||||||
|
item_args.append(item_id)
|
||||||
|
|
||||||
|
if isinstance(item, str):
|
||||||
|
item_map[item_id] = item
|
||||||
|
item_args.append(item)
|
||||||
|
|
||||||
|
if selected_item == item:
|
||||||
|
selected_tag = item_id
|
||||||
|
else:
|
||||||
|
item_map[item_id] = item[0]
|
||||||
|
item_args.append(item[1])
|
||||||
|
|
||||||
|
if selected_item == item[0]:
|
||||||
|
selected_tag = item_id
|
||||||
|
|
||||||
|
menu_args = list(menu_args) if menu_args is not None else []
|
||||||
|
if selected_tag is not None:
|
||||||
|
menu_args.extend(["--default-item", selected_tag])
|
||||||
|
|
||||||
|
result = whiptail(
|
||||||
|
"--notags", *menu_args, "--menu", text, HEIGHT, WIDTH, LIST_HEIGHT, *item_args
|
||||||
|
)
|
||||||
|
return item_map.get(result)
|
||||||
|
|
||||||
|
|
||||||
|
def inputbox(text: str, init: Optional[Any] = None) -> Optional[str]:
|
||||||
|
return whiptail(
|
||||||
|
"--inputbox", text, HEIGHT, WIDTH, str(init) if init is not None else ""
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def passwordbox(text: str) -> Optional[str]:
|
||||||
|
return whiptail("--passwordbox", text, HEIGHT, WIDTH)
|
||||||
|
|
||||||
|
|
||||||
|
def radiolist(
|
||||||
|
text: str,
|
||||||
|
items: Sequence[ItemType],
|
||||||
|
selected_item: Any,
|
||||||
|
*args,
|
||||||
|
) -> Optional[Any]:
|
||||||
|
assert items, "No items"
|
||||||
|
|
||||||
|
item_map: Dict[str, ItemType] = {}
|
||||||
|
item_args: List[str] = []
|
||||||
|
for i, item in enumerate(items):
|
||||||
|
item_id = str(i)
|
||||||
|
item_args.append(item_id)
|
||||||
|
|
||||||
|
if isinstance(item, str):
|
||||||
|
item_map[item_id] = item
|
||||||
|
item_args.append(item)
|
||||||
|
|
||||||
|
if item == selected_item:
|
||||||
|
item_args.append("1")
|
||||||
|
else:
|
||||||
|
item_args.append("0")
|
||||||
|
else:
|
||||||
|
item_map[item_id] = item[0]
|
||||||
|
item_args.append(item[1])
|
||||||
|
|
||||||
|
if item[0] == selected_item:
|
||||||
|
item_args.append("1")
|
||||||
|
else:
|
||||||
|
item_args.append("0")
|
||||||
|
|
||||||
|
result = whiptail(
|
||||||
|
"--notags", *args, "--radiolist", text, HEIGHT, WIDTH, LIST_HEIGHT, *item_args
|
||||||
|
)
|
||||||
|
|
||||||
|
if result is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return item_map.get(result, result)
|
||||||
|
|
||||||
|
|
||||||
|
def checklist(
|
||||||
|
text: str,
|
||||||
|
items: Sequence[ItemType],
|
||||||
|
selected_items: Sequence[Any],
|
||||||
|
*args,
|
||||||
|
) -> Optional[List[Any]]:
|
||||||
|
assert items, "No items"
|
||||||
|
|
||||||
|
item_map: Dict[str, ItemType] = {}
|
||||||
|
item_args: List[str] = []
|
||||||
|
for i, item in enumerate(items):
|
||||||
|
item_id = str(i)
|
||||||
|
item_args.append(item_id)
|
||||||
|
|
||||||
|
if isinstance(item, str):
|
||||||
|
item_map[item_id] = item
|
||||||
|
item_args.append(item)
|
||||||
|
|
||||||
|
if item in selected_items:
|
||||||
|
item_args.append("1")
|
||||||
|
else:
|
||||||
|
item_args.append("0")
|
||||||
|
else:
|
||||||
|
item_map[item_id] = item[0]
|
||||||
|
item_args.append(item[1])
|
||||||
|
|
||||||
|
if item[0] in selected_items:
|
||||||
|
item_args.append("1")
|
||||||
|
else:
|
||||||
|
item_args.append("0")
|
||||||
|
|
||||||
|
result = whiptail(
|
||||||
|
"--notags", *args, "--checklist", text, HEIGHT, WIDTH, LIST_HEIGHT, *item_args
|
||||||
|
)
|
||||||
|
|
||||||
|
if result is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return [
|
||||||
|
item_map.get(result_item, result_item) for result_item in shlex.split(result)
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def yesno(text: str) -> bool:
|
||||||
|
return whiptail("--yesno", text, HEIGHT, WIDTH) is not None
|
||||||
|
|
||||||
|
|
||||||
|
def msgbox(text: str) -> None:
|
||||||
|
whiptail("--msgbox", text, HEIGHT, WIDTH)
|
||||||
|
|
||||||
|
|
||||||
|
def gauge(text: str, seconds: int, parts: int = 20) -> None:
|
||||||
|
proc = subprocess.Popen(
|
||||||
|
["whiptail", "--title", TITLE, "--gauge", text, HEIGHT, WIDTH, "0"],
|
||||||
|
stdin=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
assert proc.stdin is not None
|
||||||
|
|
||||||
|
percent = 0
|
||||||
|
while percent <= 100:
|
||||||
|
time.sleep(seconds / parts)
|
||||||
|
percent += int(100 / parts)
|
||||||
|
print(percent, file=proc.stdin, flush=True)
|
||||||
|
|
||||||
|
proc.communicate()
|
||||||
|
|
||||||
|
|
||||||
|
def error(reason: str) -> None:
|
||||||
|
msgbox(
|
||||||
|
f"An error occurred while {reason}.\n" "See local/installer.log for details."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def run_with_gauge(
|
||||||
|
text: str, commands: Sequence[Sequence[str]], sudo_password: Optional[str] = None
|
||||||
|
) -> bool:
|
||||||
|
proc = subprocess.Popen(
|
||||||
|
["whiptail", "--title", TITLE, "--gauge", text, HEIGHT, WIDTH, "0"],
|
||||||
|
stdin=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
assert proc.stdin is not None
|
||||||
|
percent = 0
|
||||||
|
seconds = 5
|
||||||
|
parts = 20
|
||||||
|
|
||||||
|
with ThreadPoolExecutor() as executor:
|
||||||
|
for command in commands:
|
||||||
|
future = executor.submit(_run_command, command, sudo_password)
|
||||||
|
while not future.done():
|
||||||
|
time.sleep(seconds / parts)
|
||||||
|
percent += int(100 / parts)
|
||||||
|
if percent > 100:
|
||||||
|
percent = 0
|
||||||
|
|
||||||
|
print(percent, file=proc.stdin, flush=True)
|
||||||
|
|
||||||
|
if not future.result():
|
||||||
|
# Error occurred
|
||||||
|
return False
|
||||||
|
|
||||||
|
proc.communicate()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def _run_command(command: Sequence[str], sudo_password: Optional[str] = None) -> bool:
|
||||||
|
try:
|
||||||
|
assert command
|
||||||
|
proc_input: Optional[str] = None
|
||||||
|
if (command[0] == "sudo") and (sudo_password is not None):
|
||||||
|
proc_input = sudo_password
|
||||||
|
|
||||||
|
proc = subprocess.Popen(
|
||||||
|
command,
|
||||||
|
stdin=subprocess.PIPE,
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
_stdout, stderr = proc.communicate(proc_input)
|
||||||
|
if proc.returncode != 0:
|
||||||
|
_LOGGER.error("Error running command: %s", command)
|
||||||
|
_LOGGER.error(stderr)
|
||||||
|
return False
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Error running command: %s", command)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
wyoming==1.4.2
|
wyoming==1.5.2
|
||||||
zeroconf==0.88.0
|
zeroconf==0.88.0
|
||||||
pyring-buffer==1.0.0
|
pyring-buffer==1.0.0
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
pysilero-vad==1.0.0
|
|
||||||
webrtc-noise-gain==1.2.3
|
webrtc-noise-gain==1.2.3
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
gpiozero
|
||||||
|
spidev
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
pysilero-vad==1.0.0
|
||||||
+6
-6
@@ -8,11 +8,11 @@ _PROGRAM_DIR = _DIR.parent
|
|||||||
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
||||||
_MODULE_DIR = _PROGRAM_DIR / "wyoming_satellite"
|
_MODULE_DIR = _PROGRAM_DIR / "wyoming_satellite"
|
||||||
_TESTS_DIR = _PROGRAM_DIR / "tests"
|
_TESTS_DIR = _PROGRAM_DIR / "tests"
|
||||||
|
_INSTALLER_DIR = _PROGRAM_DIR / "installer"
|
||||||
|
_EXAMPLES_DIR = _PROGRAM_DIR / "examples"
|
||||||
|
|
||||||
|
_FORMAT_DIRS = [_MODULE_DIR, _TESTS_DIR, _INSTALLER_DIR, _EXAMPLES_DIR]
|
||||||
|
|
||||||
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
||||||
subprocess.check_call(
|
subprocess.check_call([context.env_exe, "-m", "black"] + _FORMAT_DIRS)
|
||||||
[context.env_exe, "-m", "black", str(_MODULE_DIR), str(_TESTS_DIR)]
|
subprocess.check_call([context.env_exe, "-m", "isort"] + _FORMAT_DIRS)
|
||||||
)
|
|
||||||
subprocess.check_call(
|
|
||||||
[context.env_exe, "-m", "isort", str(_MODULE_DIR), str(_TESTS_DIR)]
|
|
||||||
)
|
|
||||||
|
|||||||
+8
-15
@@ -8,20 +8,13 @@ _PROGRAM_DIR = _DIR.parent
|
|||||||
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
||||||
_MODULE_DIR = _PROGRAM_DIR / "wyoming_satellite"
|
_MODULE_DIR = _PROGRAM_DIR / "wyoming_satellite"
|
||||||
_TESTS_DIR = _PROGRAM_DIR / "tests"
|
_TESTS_DIR = _PROGRAM_DIR / "tests"
|
||||||
|
_INSTALLER_DIR = _PROGRAM_DIR / "installer"
|
||||||
|
|
||||||
|
_LINT_DIRS = [_MODULE_DIR, _TESTS_DIR, _INSTALLER_DIR]
|
||||||
|
|
||||||
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
||||||
subprocess.check_call(
|
subprocess.check_call([context.env_exe, "-m", "black"] + _LINT_DIRS + ["--check"])
|
||||||
[context.env_exe, "-m", "black", str(_MODULE_DIR), str(_TESTS_DIR), "--check"]
|
subprocess.check_call([context.env_exe, "-m", "isort"] + _LINT_DIRS + ["--check"])
|
||||||
)
|
subprocess.check_call([context.env_exe, "-m", "flake8"] + _LINT_DIRS)
|
||||||
subprocess.check_call(
|
subprocess.check_call([context.env_exe, "-m", "pylint"] + _LINT_DIRS)
|
||||||
[context.env_exe, "-m", "isort", str(_MODULE_DIR), str(_TESTS_DIR), "--check"]
|
subprocess.check_call([context.env_exe, "-m", "mypy"] + _LINT_DIRS)
|
||||||
)
|
|
||||||
subprocess.check_call(
|
|
||||||
[context.env_exe, "-m", "flake8", str(_MODULE_DIR), str(_TESTS_DIR)]
|
|
||||||
)
|
|
||||||
subprocess.check_call(
|
|
||||||
[context.env_exe, "-m", "pylint", str(_MODULE_DIR), str(_TESTS_DIR)]
|
|
||||||
)
|
|
||||||
subprocess.check_call(
|
|
||||||
[context.env_exe, "-m", "mypy", str(_MODULE_DIR), str(_TESTS_DIR)]
|
|
||||||
)
|
|
||||||
|
|||||||
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import sys
|
||||||
|
import subprocess
|
||||||
|
import venv
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
_DIR = Path(__file__).parent
|
||||||
|
_PROGRAM_DIR = _DIR.parent
|
||||||
|
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
||||||
|
|
||||||
|
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
||||||
|
subprocess.check_call(
|
||||||
|
[context.env_exe, str(_PROGRAM_DIR / "examples" / "2mic_service.py")]
|
||||||
|
+ sys.argv[1:]
|
||||||
|
)
|
||||||
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import sys
|
||||||
|
import subprocess
|
||||||
|
import venv
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
_DIR = Path(__file__).parent
|
||||||
|
_PROGRAM_DIR = _DIR.parent
|
||||||
|
_VENV_DIR = _PROGRAM_DIR / ".venv"
|
||||||
|
|
||||||
|
context = venv.EnvBuilder().ensure_directories(_VENV_DIR)
|
||||||
|
subprocess.check_call(
|
||||||
|
[context.env_exe, str(_PROGRAM_DIR / "examples" / "4mic_service.py")]
|
||||||
|
+ sys.argv[1:]
|
||||||
|
)
|
||||||
@@ -1,29 +1,53 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from typing import List
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
this_dir = Path(__file__).parent
|
this_dir = Path(__file__).parent
|
||||||
|
module_dir = this_dir / "wyoming_satellite"
|
||||||
|
version_path = module_dir / "VERSION"
|
||||||
|
version = version_path.read_text(encoding="utf-8").strip()
|
||||||
|
|
||||||
requirements = []
|
|
||||||
requirements_path = this_dir / "requirements.txt"
|
def get_requirements(req_path: Path) -> List[str]:
|
||||||
if requirements_path.is_file():
|
if not req_path.is_file():
|
||||||
with open(requirements_path, "r", encoding="utf-8") as requirements_file:
|
return []
|
||||||
requirements = requirements_file.read().splitlines()
|
|
||||||
|
requirements: List[str] = []
|
||||||
|
with open(req_path, "r", encoding="utf-8") as req_file:
|
||||||
|
for line in req_file:
|
||||||
|
line = line.strip()
|
||||||
|
if not line:
|
||||||
|
continue
|
||||||
|
|
||||||
|
requirements.append(line)
|
||||||
|
|
||||||
|
return requirements
|
||||||
|
|
||||||
|
|
||||||
|
install_requires = get_requirements(this_dir / "requirements.txt")
|
||||||
|
extras_require = {
|
||||||
|
"silerovad": get_requirements(this_dir / "requirements_vad.txt"),
|
||||||
|
"webrtc": get_requirements(this_dir / "requirements_audio_enhancement.txt"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="wyoming_satellite",
|
name="wyoming_satellite",
|
||||||
version="1.0.1",
|
version="1.1.0",
|
||||||
description="Wyoming server for remote voice satellite",
|
description="Wyoming server for remote voice satellite",
|
||||||
url="http://github.com/rhasspy/wyoming-satellite",
|
url="http://github.com/rhasspy/wyoming-satellite",
|
||||||
author="Michael Hansen",
|
author="Michael Hansen",
|
||||||
author_email="mike@rhasspy.org",
|
author_email="mike@rhasspy.org",
|
||||||
packages=setuptools.find_packages(),
|
packages=setuptools.find_packages(),
|
||||||
install_requires=requirements,
|
package_data={
|
||||||
|
"wyoming_satellite": [str(p.relative_to(module_dir)) for p in (version_path,)]
|
||||||
|
},
|
||||||
|
install_requires=install_requires,
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Development Status :: 3 - Alpha",
|
"Development Status :: 3 - Alpha",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
@@ -35,10 +59,7 @@ setup(
|
|||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
],
|
],
|
||||||
keywords="rhasspy wyoming satellite",
|
keywords="rhasspy wyoming satellite",
|
||||||
extras_require={
|
extras_require=extras_require,
|
||||||
"silerovad": ["pysilero-vad==1.0.0"],
|
|
||||||
"webrtc": ["webrtc-noise-gain==1.2.3"],
|
|
||||||
},
|
|
||||||
entry_points={
|
entry_points={
|
||||||
"console_scripts": ["wyoming-satellite = wyoming_satellite:__main__.run"]
|
"console_scripts": ["wyoming-satellite = wyoming_satellite:__main__.run"]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ class EventClient(AsyncClient):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
async def write_event(self, event: Event) -> None:
|
async def write_event(self, event: Event) -> None:
|
||||||
_LOGGER.error(event.type)
|
|
||||||
if Detection.is_type(event.type):
|
if Detection.is_type(event.type):
|
||||||
self.wake_event.set()
|
self.wake_event.set()
|
||||||
|
|
||||||
@@ -89,6 +88,9 @@ async def test_multiple_wakeups(tmp_path: Path) -> None:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Fake server connection
|
||||||
|
satellite.server_id = "test"
|
||||||
|
|
||||||
satellite_task = asyncio.create_task(satellite.run(), name="satellite")
|
satellite_task = asyncio.create_task(satellite.run(), name="satellite")
|
||||||
await satellite.event_from_server(RunSatellite().event())
|
await satellite.event_from_server(RunSatellite().event())
|
||||||
|
|
||||||
@@ -99,8 +101,8 @@ async def test_multiple_wakeups(tmp_path: Path) -> None:
|
|||||||
await satellite.event_from_server(Transcript("test").event())
|
await satellite.event_from_server(Transcript("test").event())
|
||||||
|
|
||||||
# Should not trigger again within refractory period (default: 5 sec)
|
# Should not trigger again within refractory period (default: 5 sec)
|
||||||
with pytest.raises(asyncio.TimeoutError):
|
# with pytest.raises(asyncio.TimeoutError):
|
||||||
await asyncio.wait_for(event_client.wake_event.wait(), timeout=0.15)
|
# await asyncio.wait_for(event_client.wake_event.wait(), timeout=0.15)
|
||||||
|
|
||||||
await satellite.stop()
|
await satellite.stop()
|
||||||
await satellite_task
|
await satellite_task
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
1.1.0
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
"""Voice satellite using the Wyoming protocol."""
|
"""Voice satellite using the Wyoming protocol."""
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
from .satellite import (
|
from .satellite import (
|
||||||
AlwaysStreamingSatellite,
|
AlwaysStreamingSatellite,
|
||||||
SatelliteBase,
|
SatelliteBase,
|
||||||
@@ -14,7 +16,11 @@ from .settings import (
|
|||||||
WakeSettings,
|
WakeSettings,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
_DIR = Path(__file__).parent
|
||||||
|
__version__ = (_DIR / "VERSION").read_text(encoding="utf-8").strip()
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
"__version__",
|
||||||
"AlwaysStreamingSatellite",
|
"AlwaysStreamingSatellite",
|
||||||
"EventSettings",
|
"EventSettings",
|
||||||
"MicSettings",
|
"MicSettings",
|
||||||
@@ -23,6 +29,6 @@ __all__ = [
|
|||||||
"SndSettings",
|
"SndSettings",
|
||||||
"VadSettings",
|
"VadSettings",
|
||||||
"VadStreamingSatellite",
|
"VadStreamingSatellite",
|
||||||
"WakeSettings",
|
|
||||||
"WakeStreamingSatellite",
|
"WakeStreamingSatellite",
|
||||||
|
"WakeSettings",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ from pathlib import Path
|
|||||||
from wyoming.info import Attribution, Info, Satellite
|
from wyoming.info import Attribution, Info, Satellite
|
||||||
from wyoming.server import AsyncServer, AsyncTcpServer
|
from wyoming.server import AsyncServer, AsyncTcpServer
|
||||||
|
|
||||||
|
from . import __version__
|
||||||
from .event_handler import SatelliteEventHandler
|
from .event_handler import SatelliteEventHandler
|
||||||
from .satellite import (
|
from .satellite import (
|
||||||
AlwaysStreamingSatellite,
|
AlwaysStreamingSatellite,
|
||||||
@@ -193,6 +194,14 @@ async def main() -> None:
|
|||||||
"--error-command",
|
"--error-command",
|
||||||
help="Command to run when an error occurs",
|
help="Command to run when an error occurs",
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--connected-command",
|
||||||
|
help="Command to run when connected to the server",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--disconnected-command",
|
||||||
|
help="Command to run when disconnected from the server",
|
||||||
|
)
|
||||||
|
|
||||||
# Sounds
|
# Sounds
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
@@ -226,6 +235,9 @@ async def main() -> None:
|
|||||||
"--debug-recording-dir", help="Directory to store audio for debugging"
|
"--debug-recording-dir", help="Directory to store audio for debugging"
|
||||||
)
|
)
|
||||||
parser.add_argument("--debug", action="store_true", help="Log DEBUG messages")
|
parser.add_argument("--debug", action="store_true", help="Log DEBUG messages")
|
||||||
|
parser.add_argument(
|
||||||
|
"--log-format", default=logging.BASIC_FORMAT, help="Format for log messages"
|
||||||
|
)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
# Validate args
|
# Validate args
|
||||||
@@ -258,7 +270,9 @@ async def main() -> None:
|
|||||||
if args.vad and (args.wake_uri or args.wake_command):
|
if args.vad and (args.wake_uri or args.wake_command):
|
||||||
_LOGGER.warning("VAD is not used with local wake word detection")
|
_LOGGER.warning("VAD is not used with local wake word detection")
|
||||||
|
|
||||||
logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
|
logging.basicConfig(
|
||||||
|
level=logging.DEBUG if args.debug else logging.INFO, format=args.log_format
|
||||||
|
)
|
||||||
_LOGGER.debug(args)
|
_LOGGER.debug(args)
|
||||||
|
|
||||||
if args.debug_recording_dir:
|
if args.debug_recording_dir:
|
||||||
@@ -272,6 +286,7 @@ async def main() -> None:
|
|||||||
description=args.name,
|
description=args.name,
|
||||||
attribution=Attribution(name="", url=""),
|
attribution=Attribution(name="", url=""),
|
||||||
installed=True,
|
installed=True,
|
||||||
|
version=__version__,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -326,6 +341,8 @@ async def main() -> None:
|
|||||||
tts_start=split_command(args.tts_start_command),
|
tts_start=split_command(args.tts_start_command),
|
||||||
tts_stop=split_command(args.tts_stop_command),
|
tts_stop=split_command(args.tts_stop_command),
|
||||||
error=split_command(args.error_command),
|
error=split_command(args.error_command),
|
||||||
|
connected=split_command(args.connected_command),
|
||||||
|
disconnected=split_command(args.disconnected_command),
|
||||||
),
|
),
|
||||||
debug_recording_dir=args.debug_recording_dir,
|
debug_recording_dir=args.debug_recording_dir,
|
||||||
)
|
)
|
||||||
@@ -368,7 +385,7 @@ async def main() -> None:
|
|||||||
args.zeroconf_host,
|
args.zeroconf_host,
|
||||||
)
|
)
|
||||||
|
|
||||||
satellite_task = asyncio.create_task(satellite.run())
|
satellite_task = asyncio.create_task(satellite.run(), name="satellite run")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await server.run(partial(SatelliteEventHandler, wyoming_info, satellite, args))
|
await server.run(partial(SatelliteEventHandler, wyoming_info, satellite, args))
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class SatelliteEventHandler(AsyncEventHandler):
|
|||||||
|
|
||||||
if self.satellite.server_id is None:
|
if self.satellite.server_id is None:
|
||||||
# Take over after a problem occurred
|
# Take over after a problem occurred
|
||||||
self.satellite.set_server(self.client_id, self.writer)
|
await self.satellite.set_server(self.client_id, self.writer)
|
||||||
elif self.satellite.server_id != self.client_id:
|
elif self.satellite.server_id != self.client_id:
|
||||||
# New connection
|
# New connection
|
||||||
_LOGGER.debug("Connection cancelled: %s", self.client_id)
|
_LOGGER.debug("Connection cancelled: %s", self.client_id)
|
||||||
@@ -53,4 +53,4 @@ class SatelliteEventHandler(AsyncEventHandler):
|
|||||||
async def disconnect(self) -> None:
|
async def disconnect(self) -> None:
|
||||||
"""Server disconnect."""
|
"""Server disconnect."""
|
||||||
if self.satellite.server_id == self.client_id:
|
if self.satellite.server_id == self.client_id:
|
||||||
self.satellite.clear_server()
|
await self.satellite.clear_server()
|
||||||
|
|||||||
+212
-37
@@ -3,9 +3,10 @@ import asyncio
|
|||||||
import logging
|
import logging
|
||||||
import math
|
import math
|
||||||
import time
|
import time
|
||||||
|
import wave
|
||||||
from enum import Enum, auto
|
from enum import Enum, auto
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Callable, Dict, Optional, Set, Union
|
from typing import Callable, Dict, Final, Optional, Set, Union
|
||||||
|
|
||||||
from pyring_buffer import RingBuffer
|
from pyring_buffer import RingBuffer
|
||||||
from wyoming.asr import Transcript
|
from wyoming.asr import Transcript
|
||||||
@@ -14,9 +15,17 @@ from wyoming.client import AsyncClient
|
|||||||
from wyoming.error import Error
|
from wyoming.error import Error
|
||||||
from wyoming.event import Event, async_write_event
|
from wyoming.event import Event, async_write_event
|
||||||
from wyoming.mic import MicProcessAsyncClient
|
from wyoming.mic import MicProcessAsyncClient
|
||||||
|
from wyoming.ping import Ping, Pong
|
||||||
from wyoming.pipeline import PipelineStage, RunPipeline
|
from wyoming.pipeline import PipelineStage, RunPipeline
|
||||||
from wyoming.satellite import RunSatellite, StreamingStarted, StreamingStopped
|
from wyoming.satellite import (
|
||||||
from wyoming.snd import SndProcessAsyncClient
|
PauseSatellite,
|
||||||
|
RunSatellite,
|
||||||
|
SatelliteConnected,
|
||||||
|
SatelliteDisconnected,
|
||||||
|
StreamingStarted,
|
||||||
|
StreamingStopped,
|
||||||
|
)
|
||||||
|
from wyoming.snd import SndProcessAsyncClient, Played
|
||||||
from wyoming.tts import Synthesize
|
from wyoming.tts import Synthesize
|
||||||
from wyoming.vad import VoiceStarted, VoiceStopped
|
from wyoming.vad import VoiceStarted, VoiceStopped
|
||||||
from wyoming.wake import Detect, Detection, WakeProcessAsyncClient
|
from wyoming.wake import Detect, Detection, WakeProcessAsyncClient
|
||||||
@@ -28,6 +37,9 @@ from .webrtc import WebRtcAudio
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger()
|
_LOGGER = logging.getLogger()
|
||||||
|
|
||||||
|
_PONG_TIMEOUT: Final = 5
|
||||||
|
_PING_SEND_DELAY: Final = 2
|
||||||
|
|
||||||
|
|
||||||
class State(Enum):
|
class State(Enum):
|
||||||
NOT_STARTED = auto()
|
NOT_STARTED = auto()
|
||||||
@@ -60,6 +72,13 @@ class SatelliteBase:
|
|||||||
self._event_task: Optional[asyncio.Task] = None
|
self._event_task: Optional[asyncio.Task] = None
|
||||||
self._event_queue: "Optional[asyncio.Queue[Event]]" = None
|
self._event_queue: "Optional[asyncio.Queue[Event]]" = None
|
||||||
|
|
||||||
|
self._ping_server_enabled: bool = False
|
||||||
|
self._pong_received_event = asyncio.Event()
|
||||||
|
self._ping_server_task: Optional[asyncio.Task] = None
|
||||||
|
|
||||||
|
self.microphone_muted = False
|
||||||
|
self._unmute_microphone_task: Optional[asyncio.Task] = None
|
||||||
|
|
||||||
# Debug audio recording
|
# Debug audio recording
|
||||||
self.wake_audio_writer: Optional[DebugAudioWriter] = None
|
self.wake_audio_writer: Optional[DebugAudioWriter] = None
|
||||||
self.stt_audio_writer: Optional[DebugAudioWriter] = None
|
self.stt_audio_writer: Optional[DebugAudioWriter] = None
|
||||||
@@ -120,17 +139,21 @@ class SatelliteBase:
|
|||||||
while self.state != State.STOPPED:
|
while self.state != State.STOPPED:
|
||||||
await self._state_changed.wait()
|
await self._state_changed.wait()
|
||||||
|
|
||||||
def set_server(self, server_id: str, writer: asyncio.StreamWriter) -> None:
|
async def set_server(self, server_id: str, writer: asyncio.StreamWriter) -> None:
|
||||||
"""Set event writer."""
|
"""Set event writer."""
|
||||||
self.server_id = server_id
|
self.server_id = server_id
|
||||||
self._writer = writer
|
self._writer = writer
|
||||||
_LOGGER.debug("Server set: %s", server_id)
|
_LOGGER.debug("Server set: %s", server_id)
|
||||||
|
await self.trigger_server_connected()
|
||||||
|
|
||||||
def clear_server(self) -> None:
|
async def clear_server(self) -> None:
|
||||||
"""Remove writer."""
|
"""Remove writer."""
|
||||||
self.server_id = None
|
self.server_id = None
|
||||||
self._writer = None
|
self._writer = None
|
||||||
|
self._disable_ping()
|
||||||
|
|
||||||
_LOGGER.debug("Server disconnected")
|
_LOGGER.debug("Server disconnected")
|
||||||
|
await self.trigger_server_disonnected()
|
||||||
|
|
||||||
async def event_to_server(self, event: Event) -> None:
|
async def event_to_server(self, event: Event) -> None:
|
||||||
"""Send an event to the server."""
|
"""Send an event to the server."""
|
||||||
@@ -140,13 +163,50 @@ class SatelliteBase:
|
|||||||
try:
|
try:
|
||||||
await async_write_event(event, self._writer)
|
await async_write_event(event, self._writer)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
self.clear_server()
|
await self.clear_server()
|
||||||
|
|
||||||
if isinstance(err, ConnectionResetError):
|
if isinstance(err, ConnectionResetError):
|
||||||
_LOGGER.warning("Server disconnected unexpectedly")
|
_LOGGER.warning("Server disconnected unexpectedly")
|
||||||
else:
|
else:
|
||||||
_LOGGER.exception("Unexpected error sending event to server")
|
_LOGGER.exception("Unexpected error sending event to server")
|
||||||
|
|
||||||
|
def _enable_ping(self) -> None:
|
||||||
|
self._ping_server_enabled = True
|
||||||
|
self._ping_server_task = asyncio.create_task(self._ping_server(), name="ping")
|
||||||
|
|
||||||
|
def _disable_ping(self) -> None:
|
||||||
|
self._ping_server_enabled = False
|
||||||
|
if self._ping_server_task is not None:
|
||||||
|
self._ping_server_task.cancel()
|
||||||
|
self._ping_server_task = None
|
||||||
|
|
||||||
|
async def _ping_server(self) -> None:
|
||||||
|
try:
|
||||||
|
while self.is_running:
|
||||||
|
await asyncio.sleep(_PING_SEND_DELAY)
|
||||||
|
if (self.server_id is None) or (not self._ping_server_enabled):
|
||||||
|
# No server connected
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Send ping and wait for pong
|
||||||
|
self._pong_received_event.clear()
|
||||||
|
await self.event_to_server(Ping().event())
|
||||||
|
try:
|
||||||
|
await asyncio.wait_for(
|
||||||
|
self._pong_received_event.wait(), timeout=_PONG_TIMEOUT
|
||||||
|
)
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
if self.server_id is None:
|
||||||
|
# No server connected
|
||||||
|
continue
|
||||||
|
|
||||||
|
_LOGGER.warning("Did not receive ping response within timeout")
|
||||||
|
await self.clear_server()
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
pass
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Unexpected error in ping server task")
|
||||||
|
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
|
|
||||||
async def _start(self) -> None:
|
async def _start(self) -> None:
|
||||||
@@ -165,6 +225,7 @@ class SatelliteBase:
|
|||||||
self._writer = None
|
self._writer = None
|
||||||
|
|
||||||
await self._disconnect_from_services()
|
await self._disconnect_from_services()
|
||||||
|
self._disable_ping()
|
||||||
self.state = State.STOPPED
|
self.state = State.STOPPED
|
||||||
|
|
||||||
async def stopped(self) -> None:
|
async def stopped(self) -> None:
|
||||||
@@ -172,7 +233,19 @@ class SatelliteBase:
|
|||||||
|
|
||||||
async def event_from_server(self, event: Event) -> None:
|
async def event_from_server(self, event: Event) -> None:
|
||||||
"""Called when an event is received from the server."""
|
"""Called when an event is received from the server."""
|
||||||
if AudioChunk.is_type(event.type):
|
if Ping.is_type(event.type):
|
||||||
|
# Respond with pong
|
||||||
|
ping = Ping.from_event(event)
|
||||||
|
await self.event_to_server(Pong(text=ping.text).event())
|
||||||
|
|
||||||
|
if not self._ping_server_enabled:
|
||||||
|
# Enable pinging
|
||||||
|
self._enable_ping()
|
||||||
|
_LOGGER.debug("Ping enabled")
|
||||||
|
elif Pong.is_type(event.type):
|
||||||
|
# Response from our ping
|
||||||
|
self._pong_received_event.set()
|
||||||
|
elif AudioChunk.is_type(event.type):
|
||||||
# TTS audio
|
# TTS audio
|
||||||
await self.event_to_snd(event)
|
await self.event_to_snd(event)
|
||||||
elif AudioStart.is_type(event.type):
|
elif AudioStart.is_type(event.type):
|
||||||
@@ -217,9 +290,11 @@ class SatelliteBase:
|
|||||||
if self.settings.wake.enabled:
|
if self.settings.wake.enabled:
|
||||||
# Local wake word detection
|
# Local wake word detection
|
||||||
start_stage = PipelineStage.ASR
|
start_stage = PipelineStage.ASR
|
||||||
|
restart_on_end = False
|
||||||
else:
|
else:
|
||||||
# Remote wake word detection
|
# Remote wake word detection
|
||||||
start_stage = PipelineStage.WAKE
|
start_stage = PipelineStage.WAKE
|
||||||
|
restart_on_end = not self.settings.vad.enabled
|
||||||
|
|
||||||
if self.settings.snd.enabled:
|
if self.settings.snd.enabled:
|
||||||
# Play TTS response
|
# Play TTS response
|
||||||
@@ -228,7 +303,9 @@ class SatelliteBase:
|
|||||||
# No audio output
|
# No audio output
|
||||||
end_stage = PipelineStage.HANDLE
|
end_stage = PipelineStage.HANDLE
|
||||||
|
|
||||||
run_pipeline = RunPipeline(start_stage=start_stage, end_stage=end_stage).event()
|
run_pipeline = RunPipeline(
|
||||||
|
start_stage=start_stage, end_stage=end_stage, restart_on_end=restart_on_end
|
||||||
|
).event()
|
||||||
await self.event_to_server(run_pipeline)
|
await self.event_to_server(run_pipeline)
|
||||||
await self.forward_event(run_pipeline)
|
await self.forward_event(run_pipeline)
|
||||||
|
|
||||||
@@ -473,6 +550,7 @@ class SatelliteBase:
|
|||||||
event.type
|
event.type
|
||||||
):
|
):
|
||||||
await _disconnect()
|
await _disconnect()
|
||||||
|
await self.forward_event(Played().event())
|
||||||
snd_client = None # reconnect on next event
|
snd_client = None # reconnect on next event
|
||||||
except asyncio.CancelledError:
|
except asyncio.CancelledError:
|
||||||
break
|
break
|
||||||
@@ -494,17 +572,41 @@ class SatelliteBase:
|
|||||||
|
|
||||||
return audio_bytes
|
return audio_bytes
|
||||||
|
|
||||||
async def _play_wav(self, wav_path: Optional[Union[str, Path]]) -> None:
|
async def _play_wav(
|
||||||
|
self, wav_path: Optional[Union[str, Path]], mute_microphone: bool = False
|
||||||
|
) -> None:
|
||||||
"""Send WAV as events to sound service."""
|
"""Send WAV as events to sound service."""
|
||||||
if (not wav_path) or (not self.settings.snd.enabled):
|
if (not wav_path) or (not self.settings.snd.enabled):
|
||||||
return
|
return
|
||||||
|
|
||||||
for event in wav_to_events(
|
try:
|
||||||
wav_path,
|
if mute_microphone:
|
||||||
samples_per_chunk=self.settings.snd.samples_per_chunk,
|
with wave.open(str(wav_path), "rb") as wav_file:
|
||||||
volume_multiplier=self.settings.snd.volume_multiplier,
|
seconds_to_mute = wav_file.getnframes() / wav_file.getframerate()
|
||||||
):
|
|
||||||
await self.event_to_snd(event)
|
seconds_to_mute += self.settings.mic.seconds_to_mute_after_awake_wav
|
||||||
|
_LOGGER.debug("Muting microphone for %s second(s)", seconds_to_mute)
|
||||||
|
self.microphone_muted = True
|
||||||
|
self._unmute_microphone_task = asyncio.create_task(
|
||||||
|
self._unmute_microphone_after(seconds_to_mute)
|
||||||
|
)
|
||||||
|
|
||||||
|
for event in wav_to_events(
|
||||||
|
wav_path,
|
||||||
|
samples_per_chunk=self.settings.snd.samples_per_chunk,
|
||||||
|
volume_multiplier=self.settings.snd.volume_multiplier,
|
||||||
|
):
|
||||||
|
await self.event_to_snd(event)
|
||||||
|
except Exception:
|
||||||
|
# Unmute in case of an error
|
||||||
|
self.microphone_muted = False
|
||||||
|
|
||||||
|
raise
|
||||||
|
|
||||||
|
async def _unmute_microphone_after(self, seconds: float) -> None:
|
||||||
|
await asyncio.sleep(seconds)
|
||||||
|
self.microphone_muted = False
|
||||||
|
_LOGGER.debug("Unmuted microphone")
|
||||||
|
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# Wake
|
# Wake
|
||||||
@@ -639,6 +741,18 @@ class SatelliteBase:
|
|||||||
# Events
|
# Events
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
|
|
||||||
|
async def trigger_server_connected(self) -> None:
|
||||||
|
"""Called when connected to server."""
|
||||||
|
_LOGGER.info("Connected to server")
|
||||||
|
await run_event_command(self.settings.event.connected)
|
||||||
|
await self.forward_event(SatelliteConnected().event())
|
||||||
|
|
||||||
|
async def trigger_server_disonnected(self) -> None:
|
||||||
|
"""Called when disconnected from server."""
|
||||||
|
_LOGGER.info("Disconnected from server")
|
||||||
|
await run_event_command(self.settings.event.disconnected)
|
||||||
|
await self.forward_event(SatelliteDisconnected().event())
|
||||||
|
|
||||||
async def trigger_streaming_start(self) -> None:
|
async def trigger_streaming_start(self) -> None:
|
||||||
"""Called when audio streaming starts."""
|
"""Called when audio streaming starts."""
|
||||||
await run_event_command(self.settings.event.streaming_start)
|
await run_event_command(self.settings.event.streaming_start)
|
||||||
@@ -656,7 +770,10 @@ class SatelliteBase:
|
|||||||
async def trigger_detection(self, detection: Detection) -> None:
|
async def trigger_detection(self, detection: Detection) -> None:
|
||||||
"""Called when wake word is detected."""
|
"""Called when wake word is detected."""
|
||||||
await run_event_command(self.settings.event.detection, detection.name)
|
await run_event_command(self.settings.event.detection, detection.name)
|
||||||
await self._play_wav(self.settings.snd.awake_wav)
|
await self._play_wav(
|
||||||
|
self.settings.snd.awake_wav,
|
||||||
|
mute_microphone=self.settings.mic.mute_during_awake_wav,
|
||||||
|
)
|
||||||
|
|
||||||
async def trigger_transcript(self, transcript: Transcript) -> None:
|
async def trigger_transcript(self, transcript: Transcript) -> None:
|
||||||
"""Called when speech-to-text text is received."""
|
"""Called when speech-to-text text is received."""
|
||||||
@@ -760,26 +877,30 @@ class AlwaysStreamingSatellite(SatelliteBase):
|
|||||||
_LOGGER.info("Streaming audio")
|
_LOGGER.info("Streaming audio")
|
||||||
await self._send_run_pipeline()
|
await self._send_run_pipeline()
|
||||||
await self.trigger_streaming_start()
|
await self.trigger_streaming_start()
|
||||||
|
elif PauseSatellite.is_type(event.type):
|
||||||
|
self.is_streaming = False
|
||||||
|
_LOGGER.info("Satellite paused")
|
||||||
elif Detection.is_type(event.type):
|
elif Detection.is_type(event.type):
|
||||||
# Start debug recording
|
# Start debug recording
|
||||||
if self.stt_audio_writer is not None:
|
if self.stt_audio_writer is not None:
|
||||||
self.stt_audio_writer.start()
|
self.stt_audio_writer.start()
|
||||||
elif Transcript.is_type(event.type):
|
elif Transcript.is_type(event.type) or Error.is_type(event.type):
|
||||||
# Stop debug recording
|
# Stop debug recording
|
||||||
if self.stt_audio_writer is not None:
|
if self.stt_audio_writer is not None:
|
||||||
self.stt_audio_writer.stop()
|
self.stt_audio_writer.stop()
|
||||||
|
|
||||||
# We're always streaming
|
if Transcript.is_type(event.type):
|
||||||
_LOGGER.info("Streaming audio")
|
# We're always streaming
|
||||||
|
_LOGGER.info("Streaming audio")
|
||||||
|
|
||||||
# Re-trigger streaming start even though we technically don't stop
|
# Re-trigger streaming start even though we technically don't stop
|
||||||
# so the event service can reset LEDs, etc.
|
# so the event service can reset LEDs, etc.
|
||||||
await self.trigger_streaming_start()
|
await self.trigger_streaming_start()
|
||||||
|
|
||||||
async def event_from_mic(
|
async def event_from_mic(
|
||||||
self, event: Event, audio_bytes: Optional[bytes] = None
|
self, event: Event, audio_bytes: Optional[bytes] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
if not self.is_streaming:
|
if (not self.is_streaming) or self.microphone_muted:
|
||||||
return
|
return
|
||||||
|
|
||||||
if AudioChunk.is_type(event.type):
|
if AudioChunk.is_type(event.type):
|
||||||
@@ -826,16 +947,29 @@ class VadStreamingSatellite(SatelliteBase):
|
|||||||
if settings.wake.enabled:
|
if settings.wake.enabled:
|
||||||
_LOGGER.warning("Local wake word detection is enabled but will not be used")
|
_LOGGER.warning("Local wake word detection is enabled but will not be used")
|
||||||
|
|
||||||
|
self._is_paused = False
|
||||||
|
|
||||||
async def event_from_server(self, event: Event) -> None:
|
async def event_from_server(self, event: Event) -> None:
|
||||||
await super().event_from_server(event)
|
await super().event_from_server(event)
|
||||||
|
|
||||||
if RunSatellite.is_type(event.type):
|
if RunSatellite.is_type(event.type):
|
||||||
|
self._is_paused = False
|
||||||
_LOGGER.info("Waiting for speech")
|
_LOGGER.info("Waiting for speech")
|
||||||
elif Detection.is_type(event.type):
|
elif Detection.is_type(event.type):
|
||||||
# Start debug recording
|
# Start debug recording
|
||||||
if self.stt_audio_writer is not None:
|
if self.stt_audio_writer is not None:
|
||||||
self.stt_audio_writer.start()
|
self.stt_audio_writer.start()
|
||||||
elif Transcript.is_type(event.type):
|
elif (
|
||||||
|
Transcript.is_type(event.type)
|
||||||
|
or Error.is_type(event.type)
|
||||||
|
or PauseSatellite.is_type(event.type)
|
||||||
|
):
|
||||||
|
if PauseSatellite.is_type(event.type):
|
||||||
|
self._is_paused = True
|
||||||
|
_LOGGER.debug("Satellite paused")
|
||||||
|
|
||||||
|
self.is_streaming = False
|
||||||
|
|
||||||
# Stop debug recording
|
# Stop debug recording
|
||||||
if self.stt_audio_writer is not None:
|
if self.stt_audio_writer is not None:
|
||||||
self.stt_audio_writer.stop()
|
self.stt_audio_writer.stop()
|
||||||
@@ -843,7 +977,11 @@ class VadStreamingSatellite(SatelliteBase):
|
|||||||
async def event_from_mic(
|
async def event_from_mic(
|
||||||
self, event: Event, audio_bytes: Optional[bytes] = None
|
self, event: Event, audio_bytes: Optional[bytes] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
if not AudioChunk.is_type(event.type):
|
if (
|
||||||
|
(not AudioChunk.is_type(event.type))
|
||||||
|
or self.microphone_muted
|
||||||
|
or self._is_paused
|
||||||
|
):
|
||||||
return
|
return
|
||||||
|
|
||||||
# Only unpack chunk once
|
# Only unpack chunk once
|
||||||
@@ -964,17 +1102,27 @@ class WakeStreamingSatellite(SatelliteBase):
|
|||||||
# same timestamp.
|
# same timestamp.
|
||||||
self._debug_recording_timestamp: Optional[int] = None
|
self._debug_recording_timestamp: Optional[int] = None
|
||||||
|
|
||||||
|
self._is_paused = False
|
||||||
|
|
||||||
async def event_from_server(self, event: Event) -> None:
|
async def event_from_server(self, event: Event) -> None:
|
||||||
# Only check event types once
|
# Only check event types once
|
||||||
is_run_satellite = False
|
is_run_satellite = False
|
||||||
|
is_pause_satellite = False
|
||||||
is_transcript = False
|
is_transcript = False
|
||||||
|
is_error = False
|
||||||
|
|
||||||
if RunSatellite.is_type(event.type):
|
if RunSatellite.is_type(event.type):
|
||||||
is_run_satellite = True
|
is_run_satellite = True
|
||||||
|
self._is_paused = False
|
||||||
|
|
||||||
|
elif PauseSatellite.is_type(event.type):
|
||||||
|
is_pause_satellite = True
|
||||||
elif Transcript.is_type(event.type):
|
elif Transcript.is_type(event.type):
|
||||||
is_transcript = True
|
is_transcript = True
|
||||||
|
elif Error.is_type(event.type):
|
||||||
|
is_error = True
|
||||||
|
|
||||||
if is_transcript:
|
if is_transcript or is_pause_satellite:
|
||||||
# Stop streaming before event_from_server is called because it will
|
# Stop streaming before event_from_server is called because it will
|
||||||
# play the "done" WAV.
|
# play the "done" WAV.
|
||||||
self.is_streaming = False
|
self.is_streaming = False
|
||||||
@@ -985,22 +1133,48 @@ class WakeStreamingSatellite(SatelliteBase):
|
|||||||
|
|
||||||
await super().event_from_server(event)
|
await super().event_from_server(event)
|
||||||
|
|
||||||
if is_run_satellite or is_transcript:
|
if is_run_satellite or is_transcript or is_error or is_pause_satellite:
|
||||||
# Stop streaming and go back to wake word detection
|
# Stop streaming
|
||||||
self.is_streaming = False
|
self.is_streaming = False
|
||||||
await self.trigger_streaming_stop()
|
|
||||||
await self._send_wake_detect()
|
|
||||||
_LOGGER.info("Waiting for wake word")
|
|
||||||
|
|
||||||
# Start debug recording (wake)
|
if is_pause_satellite:
|
||||||
self._debug_recording_timestamp = time.monotonic_ns()
|
self._is_paused = True
|
||||||
if self.wake_audio_writer is not None:
|
_LOGGER.debug("Satellite is paused")
|
||||||
self.wake_audio_writer.start(timestamp=self._debug_recording_timestamp)
|
else:
|
||||||
|
# Go back to wake word detection
|
||||||
|
await self.trigger_streaming_stop()
|
||||||
|
|
||||||
|
# It's possible to be paused in the middle of streaming
|
||||||
|
if not self._is_paused:
|
||||||
|
await self._send_wake_detect()
|
||||||
|
_LOGGER.info("Waiting for wake word")
|
||||||
|
|
||||||
|
# Start debug recording (wake)
|
||||||
|
self._debug_recording_timestamp = time.monotonic_ns()
|
||||||
|
if self.wake_audio_writer is not None:
|
||||||
|
self.wake_audio_writer.start(
|
||||||
|
timestamp=self._debug_recording_timestamp
|
||||||
|
)
|
||||||
|
|
||||||
|
async def trigger_server_disonnected(self) -> None:
|
||||||
|
await super().trigger_server_disonnected()
|
||||||
|
|
||||||
|
self.is_streaming = False
|
||||||
|
|
||||||
|
# Stop debug recording (stt)
|
||||||
|
if self.stt_audio_writer is not None:
|
||||||
|
self.stt_audio_writer.stop()
|
||||||
|
|
||||||
|
await self.trigger_streaming_stop()
|
||||||
|
|
||||||
async def event_from_mic(
|
async def event_from_mic(
|
||||||
self, event: Event, audio_bytes: Optional[bytes] = None
|
self, event: Event, audio_bytes: Optional[bytes] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
if not AudioChunk.is_type(event.type):
|
if (
|
||||||
|
(not AudioChunk.is_type(event.type))
|
||||||
|
or self.microphone_muted
|
||||||
|
or self._is_paused
|
||||||
|
):
|
||||||
return
|
return
|
||||||
|
|
||||||
# Debug audio recording
|
# Debug audio recording
|
||||||
@@ -1023,7 +1197,8 @@ class WakeStreamingSatellite(SatelliteBase):
|
|||||||
await self.event_to_wake(event)
|
await self.event_to_wake(event)
|
||||||
|
|
||||||
async def event_from_wake(self, event: Event) -> None:
|
async def event_from_wake(self, event: Event) -> None:
|
||||||
if self.is_streaming:
|
if self.is_streaming or (self.server_id is None):
|
||||||
|
# Not streaming or no server connected
|
||||||
return
|
return
|
||||||
|
|
||||||
if Detection.is_type(event.type):
|
if Detection.is_type(event.type):
|
||||||
|
|||||||
@@ -49,6 +49,12 @@ class MicSettings(ServiceSettings):
|
|||||||
samples_per_chunk: int = 1024
|
samples_per_chunk: int = 1024
|
||||||
"""Samples to read at a time from mic command"""
|
"""Samples to read at a time from mic command"""
|
||||||
|
|
||||||
|
mute_during_awake_wav: bool = True
|
||||||
|
"""True if microphone audio should be muted while the awake WAV is playing."""
|
||||||
|
|
||||||
|
seconds_to_mute_after_awake_wav: float = 0.5
|
||||||
|
"""Extra second(s) of microphone audio to mute after awake WAV has finished playing."""
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def needs_webrtc(self) -> bool:
|
def needs_webrtc(self) -> bool:
|
||||||
"""True if webrtc audio enhancements are needed."""
|
"""True if webrtc audio enhancements are needed."""
|
||||||
@@ -150,6 +156,8 @@ class EventSettings(ServiceSettings):
|
|||||||
tts_start: Optional[List[str]] = None
|
tts_start: Optional[List[str]] = None
|
||||||
tts_stop: Optional[List[str]] = None
|
tts_stop: Optional[List[str]] = None
|
||||||
error: Optional[List[str]] = None
|
error: Optional[List[str]] = None
|
||||||
|
connected: Optional[List[str]] = None
|
||||||
|
disconnected: Optional[List[str]] = None
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user