Skip to content

Commit

Permalink
Update neon-utils to resolve deprecation warnings
Browse files Browse the repository at this point in the history
Configure signal methods to skip patching now-deprecated FS signal handling
Update `send_diagnostics` to avoid calling deprecated function
  • Loading branch information
NeonDaniel committed Sep 20, 2024
1 parent 90847d6 commit 66e8237
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
5 changes: 4 additions & 1 deletion docker_overlay/etc/neon/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ play_wav_cmdline: "play %1"
play_mp3_cmdline: "play %1"
play_ogg_cmdline: "play %1"
ready_settings:
- skills
- skills
signal:
use_signal_files: false
patch_imports: false
1 change: 1 addition & 0 deletions neon_core/configuration/mark_2/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ gui:
homescreen_supported: true
signal:
use_signal_files: false
patch_imports: false
skills:
common_query:
extension_time: 5
Expand Down
2 changes: 1 addition & 1 deletion neon_core/configuration/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ MQ:
hana:
url: "https://hana.neonaiservices.com"
signal:
use_signal_files: true
use_signal_files: false
max_wait_seconds: 300

# Logging Config
Expand Down
11 changes: 7 additions & 4 deletions neon_core/util/diagnostic_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
from os.path import join, isfile, basename, splitext
from json_database import xdg_data_home, xdg_config_home

from neon_utils import LOG
from neon_utils.metrics_utils import report_metric
from ovos_utils.log import LOG
from neon_utils.configuration_utils import NGIConfig

from ovos_bus_client.message import Message
from ovos_bus_client.util import get_mycroft_bus
from ovos_config.config import Configuration


Expand Down Expand Up @@ -111,10 +112,12 @@ def send_diagnostics(allow_logs=True, allow_transcripts=True, allow_config=True)
# else:
transcripts = None

data = {"host": socket.gethostname(),
data = {"name": "diagnostics",
"host": socket.gethostname(),
"startup": startup_text,
"configurations": json.dumps(configs) if configs else None,
"logs": json.dumps(logs) if logs else None,
"transcripts": transcripts}
report_metric("diagnostics", **data)
bus = get_mycroft_bus()
bus.emit(Message("neon.metric", data=data))
return data
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ovos-core[lgpl]~=0.0.8
# padacioso==0.1.3a2

neon-utils[network,audio]~=1.11,>=1.11.1a3
neon-utils[network,audio]~=1.11,>=1.11.1a4
# TODO: `audio` extra for dependency resolution
ovos-utils~=0.0,>=0.0.38
ovos-bus-client~=0.0,>=0.0.10
Expand Down

0 comments on commit 66e8237

Please sign in to comment.