From df7a08a635104ca4e419cbb8e2bf3c12612e86fe Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:34:46 -0700 Subject: [PATCH] Patch backwards-compat method removed from ovos-utils 0.1 Replaces #525 Failure noted in https://github.com/NeonGeckoCom/skill-date_time/actions/runs/10852700501/job/30119334006 --- neon_utils/skills/mycroft_skill.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/neon_utils/skills/mycroft_skill.py b/neon_utils/skills/mycroft_skill.py index d4cb7961..c9388d64 100644 --- a/neon_utils/skills/mycroft_skill.py +++ b/neon_utils/skills/mycroft_skill.py @@ -35,9 +35,9 @@ from typing import Optional from json_database import JsonStorage from ovos_bus_client.message import Message -from ovos_utils.log import log_deprecation +from ovos_utils.log import log_deprecation, deprecated from ovos_workshop.skills.mycroft_skill import MycroftSkill -from ovos_utils.skills.settings import get_local_settings +# from ovos_utils.skills.settings import get_local_settings from neon_utils.signal_utils import wait_for_signal_clear, check_for_signal from neon_utils.logger import LOG @@ -47,6 +47,19 @@ from neon_utils.user_utils import get_user_prefs +@deprecated("deprecated without replacement, skill settings no longer shipped in skill folder", "0.1.0") +def get_local_settings(skill_dir, skill_name=None) -> dict: + """Build a JsonStorage using the JSON string stored in settings.json.""" + if skill_name: + log_deprecation("skill_name is an unused legacy argument", "0.1.0") + if skill_dir.endswith("/settings.json"): + settings_path = skill_dir + else: + settings_path = os.path.join(skill_dir, 'settings.json') + LOG.info(settings_path) + return JsonStorage(settings_path) + + class PatchedMycroftSkill(MycroftSkill): def __init__(self, name=None, bus=None, *args, **kwargs): MycroftSkill.__init__(self, name, bus, *args, **kwargs)