From d03e4c6bbbefa46727f892a483221469716981a3 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:19:03 -0700 Subject: [PATCH 01/16] Update OVOS dependencies to allow 0.x versions --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2aa10ff4..91ebf965 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ timezonefinder~=5.2 ovos-bus-client~=0.0.4 ovos-utils~=0.0, >=0.0.34 neon-utils~=1.8,>=1.8.1 -ovos-workshop~=0.0.12 +ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 4b0c016c73084ed36e7f456f51fbe89ad3a55329 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 16:20:03 +0000 Subject: [PATCH 02/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index 5034fe54..4a40d755 100644 --- a/skill.json +++ b/skill.json @@ -20,7 +20,7 @@ "ovos-bus-client~=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", - "ovos-workshop~=0.0.12", + "ovos-workshop~=0.0,>=0.0.12", "pytz>=2022.1", "timezonefinder~=5.2" ], From 97ee06ab9638e3222b1b11f5bf8d49d8ce4b1605 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:26:48 -0700 Subject: [PATCH 03/16] Troubleshoot unit test failures --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 91ebf965..f3d13507 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ pytz>=2022.1 geocoder~=1.38 timezonefinder~=5.2 -ovos-bus-client~=0.0.4 +ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 -neon-utils~=1.8,>=1.8.1 +neon-utils~=1.8,>=1.11.1a2 ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 02e021b9cf96db9caa04862e6dfd67438f8ef61f Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 16:27:58 +0000 Subject: [PATCH 04/16] Update skill.json --- skill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skill.json b/skill.json index 4a40d755..e6bbb5ef 100644 --- a/skill.json +++ b/skill.json @@ -16,8 +16,8 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils~=1.8,>=1.8.1", - "ovos-bus-client~=0.0.4", + "neon-utils~=1.8,>=1.11.1a2", + "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", "ovos-workshop~=0.0,>=0.0.12", From 5b3bca4909223ec6d23b6d352a26cdb3522a785b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:42:15 -0700 Subject: [PATCH 05/16] Validate fix in neon-utils --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f3d13507..3ff7cb10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ geocoder~=1.38 timezonefinder~=5.2 ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 -neon-utils~=1.8,>=1.11.1a2 +#neon-utils~=1.8,>=1.11.1a2 +neon-utils@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 5484657c830ddfbcee86c9da4f4928233a5f6be9 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 16:43:22 +0000 Subject: [PATCH 06/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index e6bbb5ef..78115695 100644 --- a/skill.json +++ b/skill.json @@ -16,7 +16,7 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils~=1.8,>=1.11.1a2", + "neon-utils@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", From 420a4dc72bf86de7101a6ee514b62a0fbdf03955 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:43:58 -0700 Subject: [PATCH 07/16] Validate fix in neon-utils --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3ff7cb10..b123c225 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,8 @@ geocoder~=1.38 timezonefinder~=5.2 ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 +# TODO: extras patching version resolution #neon-utils~=1.8,>=1.11.1a2 -neon-utils@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat +neon-utils[audio,network]@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 2ef41cc5e459cfe54f77ec5c80a5fd21548b16a2 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 16:45:20 +0000 Subject: [PATCH 08/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index 78115695..f90d9355 100644 --- a/skill.json +++ b/skill.json @@ -16,7 +16,7 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", + "neon-utils[audio,network]@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", From c3050ef8530693aee0129987e8257d79bc8d38e3 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 09:52:05 -0700 Subject: [PATCH 09/16] Troubleshoot unit test failure --- __init__.py | 2 ++ requirements.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index 500f8470..ad08eb6f 100644 --- a/__init__.py +++ b/__init__.py @@ -479,6 +479,8 @@ def _get_timezone_from_neon_utils(locale: Union[dict, str]) -> \ """ if not locale: raise ValueError("Locale not specified") + if isinstance(locale, str): + locale = {"address": locale} coords = get_coordinates(locale) if coords == (-1, -1): return None diff --git a/requirements.txt b/requirements.txt index b123c225..8fe8ec15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 # TODO: extras patching version resolution #neon-utils~=1.8,>=1.11.1a2 -neon-utils[audio,network]@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat +neon-utils[audio,network] @ git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 583301e9afe670500199c7f159188f66b757a5da Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 16:53:31 +0000 Subject: [PATCH 10/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index f90d9355..a437ab1c 100644 --- a/skill.json +++ b/skill.json @@ -16,7 +16,7 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils[audio,network]@git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", + "neon-utils[audio,network] @ git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", From ec8ad6e78611cc902eec5a3b17eeae107e603537 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 10:04:09 -0700 Subject: [PATCH 11/16] Troubleshoot unit test failure --- __init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index ad08eb6f..43da4591 100644 --- a/__init__.py +++ b/__init__.py @@ -480,7 +480,10 @@ def _get_timezone_from_neon_utils(locale: Union[dict, str]) -> \ if not locale: raise ValueError("Locale not specified") if isinstance(locale, str): - locale = {"address": locale} + # `get_coordinates` expects a dict location, but it will join it to + # a string before making the API call, so `locale` can be any + # location search string + locale = {"city": locale} coords = get_coordinates(locale) if coords == (-1, -1): return None From 3850ca6b36e1973620a8215ced0009bc7e139d46 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 10:15:09 -0700 Subject: [PATCH 12/16] Troubleshoot intent test failure --- locale/uk-ua/vocab/what.day.is.it.intent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/uk-ua/vocab/what.day.is.it.intent b/locale/uk-ua/vocab/what.day.is.it.intent index db53ad2b..396d129e 100644 --- a/locale/uk-ua/vocab/what.day.is.it.intent +++ b/locale/uk-ua/vocab/what.day.is.it.intent @@ -1,4 +1,4 @@ -ти (знаєш) дату ((у|в) {location}|) +ти знаєш дату ((у|в) {location}|) (скажи мені|я хочу знати|мені потрібно знати) дату ((у|в) {location}|) який сьогодні день( (у|в) {location}|)( {location}) котра сьогодні (день|дата)( (у|в) {location}|) From da3ee81bb110a7c59cc8a076d52ed8a0048dc522 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 10:20:24 -0700 Subject: [PATCH 13/16] Update neon-utils to resolve failure --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8fe8ec15..cf27c3dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,6 @@ geocoder~=1.38 timezonefinder~=5.2 ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 -# TODO: extras patching version resolution -#neon-utils~=1.8,>=1.11.1a2 -neon-utils[audio,network] @ git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat +neon-utils~=1.8,>=1.11.1a3 ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 95479cca8a5d0ce5be115757cb6916014e84f228 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 17:21:19 +0000 Subject: [PATCH 14/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index a437ab1c..16534792 100644 --- a/skill.json +++ b/skill.json @@ -16,7 +16,7 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils[audio,network] @ git+https://github.com/neongeckocom/neon-utils@PATCH_SkillSettingsBackwardsCompat", + "neon-utils~=1.8,>=1.11.1a3", "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34", From abc2de997a389cf5778dfa9a3931085d6d889792 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 10:29:11 -0700 Subject: [PATCH 15/16] Troubleshooting test failures --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cf27c3dc..07002368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ geocoder~=1.38 timezonefinder~=5.2 ovos-bus-client~=0.0,>=0.0.4 ovos-utils~=0.0, >=0.0.34 -neon-utils~=1.8,>=1.11.1a3 +# TODO: network patching dependency resolution +neon-utils[network]~=1.8,>=1.11.1a3 ovos-workshop~=0.0,>=0.0.12 ovos-lingua-franca~=0.4 From 5e6ebc32523977deb62eaeac623df0f6a5c24aec Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 17:30:14 +0000 Subject: [PATCH 16/16] Update skill.json --- skill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skill.json b/skill.json index 16534792..044c4e68 100644 --- a/skill.json +++ b/skill.json @@ -16,7 +16,7 @@ "requirements": { "python": [ "geocoder~=1.38", - "neon-utils~=1.8,>=1.11.1a3", + "neon-utils[network]~=1.8,>=1.11.1a3", "ovos-bus-client~=0.0,>=0.0.4", "ovos-lingua-franca~=0.4", "ovos-utils~=0.0, >=0.0.34",