From 0d1453d05de7789df0aae50c2cfbbb120621bcbe Mon Sep 17 00:00:00 2001
From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:59:50 -0700
Subject: [PATCH] Update logging config handling and default configurations
 (#706)

Co-authored-by: Daniel McKnight <daniel@neon.ai>
---
 neon_core/configuration/mark_2/neon.yaml | 29 ++++++++++++------------
 neon_core/configuration/neon.yaml        | 13 ++++++-----
 neon_core/configuration/opi5/neon.yaml   | 28 ++++++++++++-----------
 neon_core/configuration/rpi4/neon.yaml   | 28 ++++++++++++-----------
 requirements/requirements.txt            |  3 ++-
 5 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml
index 88d46c945..500482db9 100644
--- a/neon_core/configuration/mark_2/neon.yaml
+++ b/neon_core/configuration/mark_2/neon.yaml
@@ -148,20 +148,21 @@ server:
 
 # Logging Config
 log_dir: /home/neon/logs/
-log_level: INFO
-logs:
-  path: /home/neon/.local/state/neon/
-  # 2M max size per log file to keep within the 10M log limit
-  max_bytes: 1048576
-  backup_count: 1
-  diagnostic: False
-  level_overrides:
-    error: []
-    warning:
-      - filelock
-      - botocore
-    info: []
-    debug: []
+logging:
+  log_level: INFO
+  logs:
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
+  bus:
+    log_level: INFO
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
 debug: False
 system_unit: imperial
 system:
diff --git a/neon_core/configuration/neon.yaml b/neon_core/configuration/neon.yaml
index 5cade8fdc..5ae7827bf 100644
--- a/neon_core/configuration/neon.yaml
+++ b/neon_core/configuration/neon.yaml
@@ -232,12 +232,13 @@ signal:
   max_wait_seconds: 300
 
 # Logging Config
-log_level: INFO
-logs:
-  path:
-  max_bytes: 50000000
-  backup_count: 3
-  diagnostic: False
+logging:
+  log_level: INFO
+  logs:
+    path:
+    max_bytes: 50000000
+    backup_count: 3
+    diagnostic: False
   level_overrides:
     error: []
     warning:
diff --git a/neon_core/configuration/opi5/neon.yaml b/neon_core/configuration/opi5/neon.yaml
index 50dc18487..49bd17669 100644
--- a/neon_core/configuration/opi5/neon.yaml
+++ b/neon_core/configuration/opi5/neon.yaml
@@ -130,19 +130,21 @@ server:
 
 # Logging Config
 log_dir: /home/neon/logs/
-log_level: INFO
-logs:
-  path: /home/neon/.local/state/neon/
-  max_bytes: 50000000
-  backup_count: 3
-  diagnostic: False
-  level_overrides:
-    error: []
-    warning:
-      - filelock
-      - botocore
-    info: []
-    debug: []
+logging:
+  log_level: INFO
+  logs:
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
+  bus:
+    log_level: INFO
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
 debug: False
 system_unit: imperial
 system:
diff --git a/neon_core/configuration/rpi4/neon.yaml b/neon_core/configuration/rpi4/neon.yaml
index 4eac379b8..b06442e3c 100644
--- a/neon_core/configuration/rpi4/neon.yaml
+++ b/neon_core/configuration/rpi4/neon.yaml
@@ -131,19 +131,21 @@ server:
 
 # Logging Config
 log_dir: /home/neon/logs/
-log_level: INFO
-logs:
-  path: /home/neon/.local/state/neon/
-  max_bytes: 50000000
-  backup_count: 3
-  diagnostic: False
-  level_overrides:
-    error: []
-    warning:
-      - filelock
-      - botocore
-    info: []
-    debug: []
+logging:
+  log_level: INFO
+  logs:
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
+  bus:
+    log_level: INFO
+    path: /home/neon/.local/state/neon/
+    # 2M max size per log file to keep within the 10M log limit
+    max_bytes: 1048576
+    backup_count: 1
+    diagnostic: False
 debug: False
 system_unit: imperial
 system:
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index c89028ff9..0cef06769 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,7 +2,8 @@
 ovos-core[mycroft,lgpl]>=0.0.8a95
 # padacioso==0.1.3a2
 
-neon-utils[network]~=1.11
+neon-utils[network,audio]~=1.11,>=1.11.1a1
+# TODO: `audio` extra for dependency resolution
 ovos-utils~=0.0,>=0.0.38
 ovos-bus-client~=0.0.8,>=0.0.9a25
 neon-transformers~=0.2,>=0.2.1a4