Merge pull request #52 from OpenVoiceOS/release-1.1.6a1

JarbasAl · web-flow · commit fddf79830ea2 · 2025-04-11T08:22:22.000+01:00
Release 1.1.6a1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,20 @@
 # Changelog
 
-## [1.1.4a1](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/tree/1.1.4a1) (2025-04-02)
+## [1.1.6a1](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/tree/1.1.6a1) (2025-04-11)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/compare/1.1.3...1.1.4a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/compare/1.1.5a1...1.1.6a1)
 
 **Merged pull requests:**
 
-- Fix/dont match weather [\#47](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/pull/47) ([JarbasAl](https://github.com/JarbasAl))
+- fix: blacklist some keywords from checking common\_qa [\#51](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/pull/51) ([JarbasAl](https://github.com/JarbasAl))
+
+## [1.1.5a1](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/tree/1.1.5a1) (2025-04-06)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/compare/1.1.4...1.1.5a1)
+
+**Merged pull requests:**
+
+- Missing translation [\#49](https://github.com/OpenVoiceOS/ovos-common-query-pipeline-plugin/pull/49) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
 
 
 
diff --git a/ovos_commonqa/locale/ca-es/Alerts.voc b/ovos_commonqa/locale/ca-es/Alerts.voc
@@ -0,0 +1,11 @@
+alarma
+alarmes
+alerta
+alertes
+campaneta
+desperta'm
+fes-me despertar
+recordatori
+recordatoris
+temporitzador
+temporitzadors
diff --git a/ovos_commonqa/locale/ca-es/MiscBlacklist.voc b/ovos_commonqa/locale/ca-es/MiscBlacklist.voc
@@ -0,0 +1,6 @@
+aquesta tarda
+ara mateix
+passat al món
+que hi ha de nou
+skills
+sobre el que fa
diff --git a/ovos_commonqa/locale/en-us/Alerts.voc b/ovos_commonqa/locale/en-us/Alerts.voc
@@ -0,0 +1,10 @@
+alarm
+alarms
+alert
+alerts
+reminder
+reminders
+timer
+timers
+wake me
+wake me up
diff --git a/ovos_commonqa/locale/en-us/MiscBlacklist.voc b/ovos_commonqa/locale/en-us/MiscBlacklist.voc
@@ -0,0 +1,9 @@
+can you
+happened in the world
+is it
+right now
+skills
+this afternoon
+what time
+what's new
+you do
diff --git a/ovos_commonqa/locale/es-es/Alerts.voc b/ovos_commonqa/locale/es-es/Alerts.voc
@@ -0,0 +1,10 @@
+alarma
+alarmas
+alerta
+alertas
+despiértame
+haz que me despierte
+recordatorio
+recordatorios
+temporizador
+temporizadores
diff --git a/ovos_commonqa/locale/eu/Alerts.voc b/ovos_commonqa/locale/eu/Alerts.voc
@@ -0,0 +1,10 @@
+alarma
+alarmak
+alerta
+alertak
+denboragailu
+denboragailuak
+esnarazi
+esnarazi nazazu
+gogorarazpen
+gogorarazpenak
diff --git a/ovos_commonqa/locale/fr-fr/QuestionWord.voc b/ovos_commonqa/locale/fr-fr/QuestionWord.voc
@@ -1,8 +1,19 @@
+Parle-moi de
+Rechercher
 comment
 dis m'en plus au sujet
 dont
+détails sur
+est-ce possible
+est-ce que c'est
+est-ce que ça
+expliquer
+informations sur
+peux-tu
 pourquoi
 qu'est-ce que
 quand
 quel
-qui
+qui
+trouve des informations
+trouve les détails
diff --git a/ovos_commonqa/locale/fr-fr/Weather.voc b/ovos_commonqa/locale/fr-fr/Weather.voc
@@ -1 +1,2 @@
+météorologie
 temps
diff --git a/ovos_commonqa/locale/gl-es/Alerts.voc b/ovos_commonqa/locale/gl-es/Alerts.voc
@@ -0,0 +1,10 @@
+alarma
+alarmas
+alerta
+alertas
+despiértame
+haz que me despierte
+recordatorio
+recordatorios
+temporizador
+temporizadores
diff --git a/ovos_commonqa/locale/pt-pt/Alerts.voc b/ovos_commonqa/locale/pt-pt/Alerts.voc
@@ -0,0 +1,10 @@
+acorda-me
+acorda-me mais tarde
+alarme
+alarmes
+alerta
+alertas
+lembrete
+lembretes
+temporizador
+temporizadores
diff --git a/ovos_commonqa/opm.py b/ovos_commonqa/opm.py
@@ -98,10 +98,16 @@ def is_question_like(self, utterance: str, lang: str) -> bool:
         if len(utterance.split(" ")) < 3:
             LOG.debug("utterance has less than 3 words, doesnt look like a question")
             return False
-        # skip utterances meant for common play
+        # skip utterances meant for common play / weather / other known conflicts
+        if self.voc_match(utterance, "MiscBlacklist", lang):
+            LOG.debug("utterance has 'blacklist' keywords, doesnt look like a general knowledge question")
+            return False
         if self.voc_match(utterance, "Weather", lang):
             LOG.debug("utterance has 'weather' keywords, doesnt look like a general knowledge question")
             return False
+        if self.voc_match(utterance, "Alerts", lang):
+            LOG.debug("utterance has 'alerts' keywords, doesnt look like a general knowledge question")
+            return False
         if self.voc_match(utterance, "Play", lang):
             LOG.debug("utterance has 'playback' keywords, doesnt look like a general knowledge question")
             return False
diff --git a/ovos_commonqa/version.py b/ovos_commonqa/version.py
@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 1
-VERSION_BUILD = 4
-VERSION_ALPHA = 0
+VERSION_BUILD = 6
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
diff --git a/translations/ca-es/vocabs.json b/translations/ca-es/vocabs.json
@@ -3,6 +3,27 @@
     "temps",
     "(metereologia|meteorològiques)"
   ],
+  "MiscBlacklist.voc": [
+    "sobre el que fa",
+    "skills",
+    "aquesta tarda",
+    "ara mateix",
+    "passat al món",
+    "que hi ha de nou"
+  ],
+  "Alerts.voc": [
+    "alerta",
+    "alertes",
+    "temporitzador",
+    "temporitzadors",
+    "recordatori",
+    "recordatoris",
+    "alarma",
+    "alarmes",
+    "campaneta",
+    "desperta'm",
+    "fes-me despertar"
+  ],
   "QuestionWord.voc": [
     "qui",
     "què",
diff --git a/translations/en-us/vocabs.json b/translations/en-us/vocabs.json
@@ -1,4 +1,27 @@
 {
+  "MiscBlacklist.voc": [
+    "what time",
+    "is it",
+    "can you",
+    "you do",
+    "skills",
+    "this afternoon",
+    "right now",
+    "happened in the world",
+    "what's new"
+  ],
+  "Alerts.voc": [
+    "alert",
+    "alerts",
+    "timer",
+    "timers",
+    "reminder",
+    "reminders",
+    "alarm",
+    "alarms",
+    "wake me",
+    "wake me up"
+  ],
   "Weather.voc": [
     "weather",
     "meteorology"
diff --git a/translations/es-es/vocabs.json b/translations/es-es/vocabs.json
@@ -2,6 +2,18 @@
   "Weather.voc": [
     "tiempo"
   ],
+  "Alerts.voc": [
+    "alerta",
+    "alertas",
+    "temporizador",
+    "temporizadores",
+    "recordatorio",
+    "recordatorios",
+    "alarma",
+    "alarmas",
+    "despiértame",
+    "haz que me despierte"
+  ],
   "QuestionWord.voc": [
     "quien",
     "qué",
diff --git a/translations/eu/vocabs.json b/translations/eu/vocabs.json
@@ -2,6 +2,18 @@
   "Weather.voc": [
     "eguraldi"
   ],
+  "Alerts.voc": [
+    "alerta",
+    "alertak",
+    "denboragailu",
+    "denboragailuak",
+    "gogorarazpen",
+    "gogorarazpenak",
+    "alarma",
+    "alarmak",
+    "esnarazi",
+    "esnarazi nazazu"
+  ],
   "QuestionWord.voc": [
     "nola",
     "zer",
diff --git a/translations/fr-fr/vocabs.json b/translations/fr-fr/vocabs.json
@@ -1,6 +1,7 @@
 {
   "Weather.voc": [
-    "temps"
+    "temps",
+    "météorologie"
   ],
   "QuestionWord.voc": [
     "qui",
@@ -11,12 +12,25 @@
     "qu'est-ce que",
     "dis m'en plus au sujet",
     "quel",
-    "dont"
+    "dont",
+    "Parle-moi de",
+    "Rechercher",
+    "informations sur",
+    "informations sur",
+    "trouve des informations",
+    "trouve des informations",
+    "trouve les détails",
+    "détails sur",
+    "expliquer",
+    "peux-tu",
+    "est-ce possible",
+    "est-ce que ça",
+    "est-ce que c'est"
   ],
   "Play.voc": [
     "cherche",
     "démarre",
     "joue",
     "lis"
   ]
-}
+}
diff --git a/translations/gl-es/vocabs.json b/translations/gl-es/vocabs.json
@@ -2,6 +2,18 @@
   "Weather.voc": [
     "tempo"
   ],
+  "Alerts.voc": [
+    "alerta",
+    "alertas",
+    "temporizador",
+    "temporizadores",
+    "recordatorio",
+    "recordatorios",
+    "alarma",
+    "alarmas",
+    "despiértame",
+    "haz que me despierte"
+  ],
   "QuestionWord.voc": [
     "quen",
     "que",
diff --git a/translations/pt-pt/vocabs.json b/translations/pt-pt/vocabs.json
@@ -3,6 +3,18 @@
     "(tempo|clima)",
     "(metereologia|metereológica)"
   ],
+  "Alerts.voc": [
+    "alerta",
+    "alertas",
+    "temporizador",
+    "temporizadores",
+    "lembrete",
+    "lembretes",
+    "alarme",
+    "alarmes",
+    "acorda-me",
+    "acorda-me mais tarde"
+  ],
   "QuestionWord.voc": [
     "quem",
     "(quê|o que|que é)",
