Update translator to use neon_lang_config

.github/workflows/core_tests.yml

@@ -30,4 +30,7 @@ jobs:
         run: |
           pytest test/test_skill_utils.py
         env:
-          GITHUB_TOKEN: ${{secrets.neon_token}}
+          GITHUB_TOKEN: ${{secrets.neon_token}}
+      - name: Test Language
+        run: |
+          pytest test/test_language.py

neon_core/language/__init__.py

@@ -68,15 +68,13 @@ class TranslatorFactory:
 
     @staticmethod
     def create(module=None):
-        # TODO: Get this from neon config
-        config = Configuration.get().get("language", {})
-        module = module or config.get("translation_module", "google")
+        config = get_neon_lang_config()
+        module = module or config.get("translation_module", "libretranslate_plug")
         if module not in DetectorFactory.CLASSES:
             # plugin!
             clazz = load_tx_plugin(module)
         else:
             clazz = TranslatorFactory.CLASSES.get(module)
-
         config["keys"] = get_private_keys()
         return clazz(config)
 
@@ -87,7 +85,7 @@ class DetectorFactory:
     @staticmethod
     def create(module=None):
         config = get_neon_lang_config()
-        module = module or config.get("detection_module", "fastlang")
+        module = module or config.get("detection_module", "libretranslate_detection_plug")
 
         if module not in DetectorFactory.CLASSES:
             # plugin!

requirements/test.txt

@@ -1,3 +1,4 @@
 pytest
 pytest-cov
-mock==4.0.2
+mock==4.0.2
+neon-lang-plugin-libretranslate>=0.1.2

test/test_language.py

@@ -0,0 +1,82 @@
+# # NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
+# # All trademark and other rights reserved by their respective owners
+# # Copyright 2008-2021 Neongecko.com Inc.
+# 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 os
+import sys
+import unittest
+
+from ovos_plugin_manager.templates.language import LanguageDetector, LanguageTranslator
+
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+from neon_core.language import *
+
+
+resolved_languages = {
+    "en": "en",
+    "en-uk": "en-uk",
+    "en-au": "en",
+    "es-mx": "es-es",
+    "es-es": "es-es"
+}
+
+
+class LanguageTests(unittest.TestCase):
+    def test_get_lang_config(self):
+        config = get_lang_config()
+        self.assertIsInstance(config, dict)
+        self.assertIsInstance(config['internal'], str)
+        self.assertIsInstance(config['user'], str)
+
+    def test_get_language_dir_valid(self):
+        base_dir = os.path.join(os.path.dirname(__file__), "lang_res")
+        self.assertEqual(get_language_dir(base_dir), os.path.join(base_dir, "en-us"))
+        for search, result in resolved_languages.items():
+            self.assertEqual(get_language_dir(base_dir, search), os.path.join(base_dir, result))
+        # self.assertEqual(get_language_dir(base_dir, "en-uk"), os.path.join(base_dir, "en-uk"))
+        # self.assertEqual(get_language_dir(base_dir, "en-au"), os.path.join(base_dir, "en"))
+        # self.assertEqual(get_language_dir(base_dir, "es-mx"), os.path.join(base_dir, "es-es"))
+        # self.assertEqual(get_language_dir(base_dir, "es-es"), os.path.join(base_dir, "es-es"))
+        # self.assertEqual(get_language_dir(base_dir, "es"), os.path.join(base_dir, "es-es"))
+
+    def test_get_language_dir_invalid(self):
+        base_dir = os.path.join(os.path.dirname(__file__), "lang_res")
+        self.assertEqual(get_language_dir(base_dir, "ru"), os.path.join(base_dir, "ru"))
+        self.assertEqual(get_language_dir(base_dir, "ru-ru"), os.path.join(base_dir, "ru-ru"))
+
+    def test_translator(self):
+        translator = TranslatorFactory.create("libretranslate_plug")
+        self.assertIsInstance(translator, LanguageTranslator)
+        output = translator.translate("hello", "es-es", "en-us")
+        self.assertEqual(output.lower(), "hola")
+
+    def test_detector(self):
+        detector = DetectorFactory.create("libretranslate_detection_plug")
+        self.assertIsInstance(detector, LanguageDetector)
+        lang = detector.detect("hello")
+        self.assertEqual(lang, "en")
+
+
+if __name__ == '__main__':
+    unittest.main()