Merge pull request #3219 from SillyTavern/pt-br Translate: Split Portuguese languages

7490357d9e674ed977e80121669cd68f3f80ea43

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 71050ef1d299cffc74f0467663693a4dd809f521 1a16957519f75b5eab2ae08dbe5ae422a7c48dc5

package-lock.json+4 -4 Viewed

                 "@popperjs/core": "^2.11.8",
                 "@zeldafan0225/ai_horde": "^5.1.0",
                 "archiver": "^7.0.1",
-                "bing-translate-api": "^2.9.1",
+                "bing-translate-api": "^4.0.2",
                 "body-parser": "^1.20.2",
                 "bowser": "^2.11.0",
                 "command-exists": "^1.2.9",

+            }
         },
         "node_modules/bing-translate-api": {
-            "version": "2.9.1",
+            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.9.1.tgz",
+            "resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.2.tgz",
-            "integrity": "sha512-DaYqa7iupfj+fj/KeaeZSp5FUY/ZR4sZ6jqoTP0RHkYOUfo7wwoxlhYDkh4VcvBBzuVORnBEgdXBVQrfM4kk7g==",
+            "integrity": "sha512-JJ8XUehnxzOhHU91oy86xEtp8OOMjVEjCZJX042fKxoO19NNvxJ5omeCcxQNFoPbDqVpBJwqiGVquL0oPdQm1Q==",
             "license": "MIT",
             "dependencies": {
                 "got": "^11.8.6"

package.json+1 -1 Viewed

         "@popperjs/core": "^2.11.8",
         "@zeldafan0225/ai_horde": "^5.1.0",
         "archiver": "^7.0.1",
-        "bing-translate-api": "^2.9.1",
+        "bing-translate-api": "^4.0.2",
         "body-parser": "^1.20.2",
         "bowser": "^2.11.0",
         "command-exists": "^1.2.9",

public/scripts/extensions/translate/index.js+2 -1 Viewed

     'Pashto': 'ps',
     'Persian': 'fa',
     'Polish': 'pl',
-    'Portuguese (Portugal, Brazil)': 'pt',
+    'Portuguese (Portugal)': 'pt-PT',
+    'Portuguese (Brazil)': 'pt-BR',
     'Punjabi': 'pa',
     'Romanian': 'ro',
     'Russian': 'ru',

src/endpoints/translate.js+66 -32 Viewed

-import https from 'node:https';
 import { createRequire } from 'node:module';
 import fetch from 'node-fetch';
 import express from 'express';
-import bingTranslateApi from 'bing-translate-api';
+import { translate as bingTranslate } from 'bing-translate-api';
 import iconv from 'iconv-lite';
+import urlJoin from 'url-join';
 import { readSecret, SECRET_KEYS } from './secrets.js';
 import { getConfigValue, uuidv4 } from '../util.js';

 const DEEPLX_URL_DEFAULT = 'http://127.0.0.1:1188/translate';
 const ONERING_URL_DEFAULT = 'http://127.0.0.1:4990/translate';
+const LINGVA_DEFAULT = 'https://lingva.ml/api/v1';
 export const router = express.Router();

         request.body.lang = 'zt';
+    }
+    if (request.body.lang === 'pt-BR' || request.body.lang === 'pt-PT') {
+        request.body.lang = 'pt';
+    }
     const text = request.body.text;
     const lang = request.body.lang;

         if (!result.ok) {
             const error = await result.text();
             console.log('LibreTranslate error: ', result.statusText, error);
-            return response.sendStatus(result.status);
+            return response.sendStatus(500);
+        }
         /** @type {any} */

 router.post('/yandex', jsonParser, async (request, response) => {
     try {
+        if (request.body.lang === 'pt-PT') {
+            request.body.lang = 'pt';
+        }
+        if (request.body.lang === 'zh-CN' || request.body.lang === 'zh-TW') {
+            request.body.lang = 'zh';
+        }
         const chunks = request.body.chunks;
         const lang = request.body.lang;

 router.post('/lingva', jsonParser, async (request, response) => {
     try {
-        const baseUrl = readSecret(request.user.directories, SECRET_KEYS.LINGVA_URL);
+        const secretUrl = readSecret(request.user.directories, SECRET_KEYS.LINGVA_URL);
+        const baseUrl = secretUrl || LINGVA_DEFAULT;
+        if (!secretUrl && baseUrl === LINGVA_DEFAULT) {
+            console.log('Lingva URL is using default value.', LINGVA_DEFAULT);
+        }
         if (!baseUrl) {
             console.log('Lingva URL is not configured.');
             return response.sendStatus(400);
+        }
+        if (request.body.lang === 'zh-CN' || request.body.lang === 'zh-TW') {
+            request.body.lang = 'zh';
+        }
+        if (request.body.lang === 'pt-BR' || request.body.lang === 'pt-PT') {
+            request.body.lang = 'pt';
+        }
         const text = request.body.text;
         const lang = request.body.lang;

+        }
         console.log('Input text: ' + text);
-        const url = `${baseUrl}/auto/${lang}/${encodeURIComponent(text)}`;
-        https.get(url, (resp) => {
+        try {
-            let data = '';
+            const url = urlJoin(baseUrl, 'auto', lang, encodeURIComponent(text));
+            const result = await fetch(url);
-            resp.on('data', (chunk) => {
+            if (!result.ok) {
-                data += chunk;
+                const error = await result.text();
-            });
+                console.log('Lingva error: ', result.statusText, error);
+            }
-            resp.on('end', () => {
+            /** @type {any} */
-                try {
+            const data = await result.json();
-                    const result = JSON.parse(data);
+            console.log('Translated text: ' + data.translation);
-                    console.log('Translated text: ' + result.translation);
+            return response.send(data.translation);
-                    return response.send(result.translation);
         } catch (error) {
-                    console.log('Translation error', error);
+            console.log('Translation error:', error);
             return response.sendStatus(500);
+        }
-            });
-        }).on('error', (err) => {
-            console.log('Translation error: ' + err.message);
-            return response.sendStatus(500);
-        });
     } catch (error) {
         console.log('Translation error', error);
         return response.sendStatus(500);

     params.append('text', text);
     params.append('target_lang', lang);
-    if (['de', 'fr', 'it', 'es', 'nl', 'ja', 'ru'].includes(lang)) {
+    if (['de', 'fr', 'it', 'es', 'nl', 'ja', 'ru', 'pt-BR', 'pt-PT'].includes(lang)) {
-        // We don't specify a Portuguese variant, so ignore formality for it.
         params.append('formality', formality);
+    }

         if (!result.ok) {
             const error = await result.text();
             console.log('DeepL error: ', result.statusText, error);
-            return response.sendStatus(result.status);
+            return response.sendStatus(500);
+        }
         /** @type {any} */

         console.log('OneRing URL is using default value.', ONERING_URL_DEFAULT);
+    }
+    if (request.body.lang === 'pt-BR' || request.body.lang === 'pt-PT') {
+        request.body.lang = 'pt';
+    }
     const text = request.body.text;
     const from_lang = request.body.from_lang;
     const to_lang = request.body.to_lang;

         if (!result.ok) {
             const error = await result.text();
             console.log('OneRing error: ', result.statusText, error);
-            return response.sendStatus(result.status);
+            return response.sendStatus(500);
+        }
         /** @type {any} */

         if (!result.ok) {
             const error = await result.text();
             console.log('DeepLX error: ', result.statusText, error);
-            return response.sendStatus(result.status);
+            return response.sendStatus(500);
+        }
         /** @type {any} */

 });
 router.post('/bing', jsonParser, async (request, response) => {
+    try {
         const text = request.body.text;
         let lang = request.body.lang;

             lang = 'zh-Hans';
+        }
+        if (request.body.lang === 'zh-TW') {
+            lang = 'zh-Hant';
+        }
+        if (request.body.lang === 'pt-BR') {
+            lang = 'pt';
+        }
         if (!text || !lang) {
             return response.sendStatus(400);
+        }
         console.log('Input text: ' + text);
-    bingTranslateApi.translate(text, null, lang).then(result => {
+        const result = await bingTranslate(text, null, lang);
-        console.log('Translated text: ' + result.translation);
+        const translatedText = result?.translation;
-        return response.send(result.translation);
+        console.log('Translated text: ' + translatedText);
-    }).catch(err => {
+        return response.send(translatedText);
-        console.log('Translation error: ' + err.message);
+    } catch (error) {
+        console.log('Translation error', error);
         return response.sendStatus(500);
-    });
+    }
 });