From 9405ff5aad2ca2bf5f4e654e183a8d805c119099 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:07:40 -0800 Subject: [PATCH] Update to address review https://github.com/NeonGeckoCom/neon-minerva/pull/20 (#21) Co-authored-by: Daniel McKnight --- neon_minerva/intent_services/common_query.py | 27 ++++++++++++++++++++ neon_minerva/tests/test_skill_resources.py | 15 +++-------- requirements/requirements.txt | 2 +- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/neon_minerva/intent_services/common_query.py b/neon_minerva/intent_services/common_query.py index 290550d..145f80d 100644 --- a/neon_minerva/intent_services/common_query.py +++ b/neon_minerva/intent_services/common_query.py @@ -1,3 +1,30 @@ +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework +# All trademark and other rights reserved by their respective owners +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import time from dataclasses import dataclass diff --git a/neon_minerva/tests/test_skill_resources.py b/neon_minerva/tests/test_skill_resources.py index 60e9e48..6a95321 100644 --- a/neon_minerva/tests/test_skill_resources.py +++ b/neon_minerva/tests/test_skill_resources.py @@ -81,17 +81,10 @@ def _on_message(cls, message): def test_skill_setup(self): self.assertEqual(self.skill.skill_id, self.test_skill_id) - if hasattr(self.skill, "_core_lang"): - # ovos-workshop < 0.0.15 - self.assertEqual(set([self.skill._core_lang] + - self.skill._secondary_langs), - set(self.supported_languages), - f"expected={self.supported_languages}") - else: - self.assertEqual(set([self.skill.core_lang] + - self.skill.secondary_langs), - set(self.supported_languages), - f"expected={self.supported_languages}") + self.assertEqual(set([self.skill.core_lang] + + self.skill.secondary_langs), + set(self.supported_languages), + f"expected={self.supported_languages}") def test_intent_registration(self): registered_adapt = list() diff --git a/requirements/requirements.txt b/requirements/requirements.txt index b78ae07..e70c9a9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,7 +1,7 @@ click~=8.0 click-default-group~=1.2 ovos-utils~=0.0, >=0.0.35 -ovos-workshop~=0.0.12 +ovos-workshop~=0.0.15 padacioso~=0.1 pyyaml>=5.4,<7.0 # PyYaml 5.4 support left for ovos-core 0.0.7 compat \ No newline at end of file