From f74071666a2cfb9a6b3897e0550d570f8f960ca8 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Tue, 9 Jan 2024 10:59:09 -0600
Subject: [PATCH] More clean up

---
 wyoming_satellite/__init__.py | 27 +++++++++++++++++++++++++++
 wyoming_satellite/settings.py | 10 +++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/wyoming_satellite/__init__.py b/wyoming_satellite/__init__.py
index b83acf5..3a4a6cc 100644
--- a/wyoming_satellite/__init__.py
+++ b/wyoming_satellite/__init__.py
@@ -1 +1,28 @@
 """Voice satellite using the Wyoming protocol."""
+from .satellite import (
+    AlwaysStreamingSatellite,
+    SatelliteBase,
+    VadStreamingSatellite,
+    WakeStreamingSatellite,
+)
+from .settings import (
+    EventSettings,
+    MicSettings,
+    SatelliteSettings,
+    SndSettings,
+    VadSettings,
+    WakeSettings,
+)
+
+__all__ = [
+    "AlwaysStreamingSatellite",
+    "EventSettings",
+    "MicSettings",
+    "SatelliteBase",
+    "SatelliteSettings",
+    "SndSettings",
+    "VadSettings",
+    "VadStreamingSatellite",
+    "WakeSettings",
+    "WakeStreamingSatellite",
+]
diff --git a/wyoming_satellite/settings.py b/wyoming_satellite/settings.py
index 765a9fd..34c99ff 100644
--- a/wyoming_satellite/settings.py
+++ b/wyoming_satellite/settings.py
@@ -1,6 +1,6 @@
 """Satellite settings."""
 from abc import ABC
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import List, Optional
 
 
@@ -153,8 +153,8 @@ class SatelliteSettings:
     """Wyoming satellite settings."""
 
     mic: MicSettings
-    vad: VadSettings
-    wake: WakeSettings
-    snd: SndSettings
-    event: EventSettings
+    vad: VadSettings = field(default_factory=VadSettings)
+    wake: WakeSettings = field(default_factory=WakeSettings)
+    snd: SndSettings = field(default_factory=SndSettings)
+    event: EventSettings = field(default_factory=EventSettings)
     restart_timeout: float = 5.0