diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ab11f9d37d4f..ff2fcf8316a9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,7 +27,6 @@ jobs: - name: Install test dependencies run: | pip install -r requirements/tests.txt - pip install git+https://github.com/OpenVoiceOS/OVOS-workshop@fallback/no_make_active pip install ./test/unittests/common_query/ovos_tskill_fakewiki pip install ./test/end2end/session/skill-ovos-hello-world pip install ./test/end2end/session/skill-ovos-fallback-unknown diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 49e0e06adaee..53e2335ecc85 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -54,7 +54,6 @@ jobs: - name: Install test dependencies run: | pip install -r requirements/tests.txt - pip install git+https://github.com/OpenVoiceOS/OVOS-workshop@fallback/no_make_active pip install ./test/unittests/common_query/ovos_tskill_fakewiki pip install ./test/end2end/session/skill-ovos-hello-world pip install ./test/end2end/session/skill-ovos-fallback-unknown diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 97a7f181216c..3545ba19a179 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -12,7 +12,7 @@ ovos-plugin-manager<0.1.0, >=0.0.24a9 ovos-config~=0.0,>=0.0.11a13 ovos-lingua-franca>=0.4.7 ovos-backend-client>=0.1.0a12 -ovos-workshop<0.1.0, >=0.0.13a5 +ovos-workshop<0.1.0, >=0.0.13a6 # provides plugins and classic machine learning framework ovos-classifiers<0.1.0, >=0.0.0a37 diff --git a/test/end2end/session/skill-ovos-fallback-unknown/__init__.py b/test/end2end/session/skill-ovos-fallback-unknown/__init__.py index 897634e2610f..ad46bfffb104 100644 --- a/test/end2end/session/skill-ovos-fallback-unknown/__init__.py +++ b/test/end2end/session/skill-ovos-fallback-unknown/__init__.py @@ -6,18 +6,5 @@ class UnknownSkill(FallbackSkill): @fallback_handler(priority=100) def handle_fallback(self, message): - utterance = message.data['utterance'].lower() - - try: - self.report_metric('failed-intent', {'utterance': utterance}) - except Exception: - self.log.exception('Error reporting metric') - - for i in ['question', 'who.is', 'why.is']: - if self.voc_match(utterance, i): - self.log.debug('Fallback type: ' + i) - self.speak_dialog(i) - break - else: - self.speak_dialog('unknown') + self.speak_dialog('unknown') return True diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog deleted file mode 100755 index 719963517c5a..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.dialog +++ /dev/null @@ -1,4 +0,0 @@ -I'm sorry I can't help you with that. -I'm not sure how to help you with that. -I don't understand, but I'm learning new things everyday. -I'm not sure how to answer that. diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc deleted file mode 100644 index 68f4b7b2f7e8..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/question.voc +++ /dev/null @@ -1,17 +0,0 @@ -what is -what will -what did -what does -what do - -where is -where will -where did -where does -where do - -when is -when will -when did -when does -when do \ No newline at end of file diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog deleted file mode 100755 index 01bc07ac2dcc..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.dialog +++ /dev/null @@ -1,2 +0,0 @@ -I don't know who that is. -I'm not sure who that is. \ No newline at end of file diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc deleted file mode 100644 index 3028282eebb2..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/who.is.voc +++ /dev/null @@ -1,5 +0,0 @@ -who is -who will -who did -who does -who do \ No newline at end of file diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog deleted file mode 100755 index 676a25f79387..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.dialog +++ /dev/null @@ -1,5 +0,0 @@ -I'm not sure how to help you with that. -I don't know. -I'm not quite sure. -I'm not sure. -I'm not sure, but I'm doing my best to learn. diff --git a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc b/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc deleted file mode 100644 index 5d8c450d37fd..000000000000 --- a/test/end2end/session/skill-ovos-fallback-unknown/locale/en-us/why.is.voc +++ /dev/null @@ -1,5 +0,0 @@ -why is -why will -why did -why does -why do \ No newline at end of file