Merge pull request #274 from OpenVoiceOS/release-2.2.2a1

Release 2.2.2a1

CHANGELOG.md

@@ -1,12 +1,12 @@
 # Changelog
 
-## [2.2.1a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/2.2.1a1) (2024-11-07)
+## [2.2.2a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/2.2.2a1) (2024-11-11)
 
-[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/2.2.0...2.2.1a1)
+[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/2.2.1...2.2.2a1)
 
 **Merged pull requests:**
 
-- pt-pt/translate [\#271](https://github.com/OpenVoiceOS/OVOS-workshop/pull/271) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
+- fix: drop lingua\_franca [\#268](https://github.com/OpenVoiceOS/OVOS-workshop/pull/268) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

ovos_workshop/skills/ovos.py

@@ -16,8 +16,8 @@
 import binascii
 from json_database import JsonStorage
 from langcodes import closest_match
-from lingua_franca.format import pronounce_number, join_list
-from lingua_franca.parse import yes_or_no, extract_number
+from ovos_number_parser import pronounce_number, extract_number
+from ovos_yes_no_solver import YesNoSolver
 from ovos_bus_client import MessageBusClient
 from ovos_bus_client.apis.enclosure import EnclosureAPI
 from ovos_bus_client.apis.gui import GUIInterface
@@ -2012,17 +2012,7 @@ def ask_yesno(self, prompt: str,
             'no', including a response of None.
         """
         resp = self.get_response(dialog=prompt, data=data)
-        # TODO - lingua_franca does not support standardized lang tags
-        #  deprecate it, use a plugin here https://github.com/TigreGotico/ovos-solver-YesNo-plugin
-        lf_langs = ("az-az", "ca-es", "cs-cz", "da-dk", "de-de",
-                    "en-us", "es-es", "fr-fr",
-                    "hu-hu", "it-it", "nl-nl", "pl-pl",
-                    "fa-ir", "pt-pt", "ru-ru", "sl-si",
-                    "sv-se", "tr-tr", "eu-eu", "uk-ua")
-        lang, score = closest_match(self.lang, lf_langs)
-        if score > 10:
-            lang = self.lang  # let it raise a value Error in next line
-        answer = yes_or_no(resp, lang=lang) if resp else resp
+        answer = YesNoSolver().match_yes_or_no(resp, lang=self.lang) if resp else resp
         if answer is True:
             return "yes"
         elif answer is False:

ovos_workshop/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 2
 VERSION_MINOR = 2
-VERSION_BUILD = 1
-VERSION_ALPHA = 0
+VERSION_BUILD = 2
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK

requirements/requirements.txt

@@ -2,7 +2,8 @@ ovos-utils>= 0.2.1,<1.0.0
 ovos_bus_client>=0.0.8,<2.0.0
 ovos-config>=0.0.12,<1.0.0
 ovos-backend-client>=0.1.0,<2.0.0
-ovos-lingua-franca>=0.4.6,<1.0.0
+ovos-solver-yes-no-plugin>=0.0.1,<1.0.0
+ovos-number-parser>=0.0.1,<1.0.0
 rapidfuzz
 langcodes
 padacioso