generaltranslation 1.1.16 → 1.1.18

package/index.js

@@ -4,7 +4,7 @@
 // ----- IMPORTS ----- //
 
 const { _getLanguageName, _getLanguageCode } = require('./codes/codes.js');
-const { _getModelList, _getModelLanguages, _isLanguageSupported } = require('./models/models.js');
+const { _getModelList, _getModelInfo, _getModelLanguages, _isLanguageSupported } = require('./models/models.js');
 const { _translate } = require('./translate/translate.js');
 
 // ----- CORE CLASS ----- // 
@@ -25,6 +25,7 @@ class GT {
 
     // Model information functions
     getModelList = _getModelList; // returns array of supported model names
+    getModelInfo = _getModelInfo; // returns model object
     getModelLanguages = _getModelLanguages; // e.g. 'mistral-7b' => ['en']
     isLanguageSupported = _isLanguageSupported; // e.g. ('mistral-7b', 'en') => true
 
@@ -32,7 +33,6 @@ class GT {
     getPrompt = async (prompt, code) => {
         return await _translate(prompt, code, this.defaultLanguage, this.apiKey);
     }
-
     // Translation (same as prompt internationalization)
     translate = async (content, code) => {
         return await _translate(content, code, this.defaultLanguage, this.apiKey);

package/models/models.js

@@ -45,6 +45,7 @@ const _isLanguageSupported = async (model, code) => {
 
 module.exports = {
     _getModelList,
+    _getModelInfo,
     _getModelLanguages,
     _isLanguageSupported
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generaltranslation",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "A language toolkit for AI developers",
   "main": "index.js",
   "scripts": {

package/translate/translate.js

@@ -7,7 +7,7 @@ const _shouldTranslate = item => typeof item?.translate === 'boolean' ? item.tra
 // Separates out text that shouldn't be translated.
 const _processContent = (content) => {
     const processed = [];
-    const redacted = [];
+    const untranslated = [];
     if (Array.isArray(content)) {
         for (const item of content) {
             if (typeof item === 'string') {
@@ -18,7 +18,7 @@ const _processContent = (content) => {
                 processed.push(item);
             } else {
                 processed.push({text: '', translate: false});
-                redacted.push(item);
+                untranslated.push(item);
             }
         }
     } else {
@@ -30,49 +30,49 @@ const _processContent = (content) => {
             processed.push(content);
         } else {
             processed.push({text: '', translate: false});
-            redacted.push(content);
+            untranslated.push(content);
         }
     } 
     return {
         processed: processed,
-        redacted: redacted.length > 0 ? redacted : null
+        untranslated: untranslated.length > 0 ? untranslated : null
     }
 }
 
 // Build content string from array or single item
-const _constructContent = ({translated, redacted = null}) => {
-    if (Array.isArray(translated)) {
+const _constructContent = ({ content, untranslated = null}) => {
+    if (Array.isArray(content)) {
         let final = '';
-        for (const item of translated) {
+        for (const item of content) {
             if (typeof item === 'string') final += item;
             else if (_shouldTranslate(item)) final += item?.text || '';
             else {
-                if (redacted?.length > 0) {
-                    final += redacted?.shift().text || '';
+                if (untranslated?.length > 0) {
+                    final += untranslated?.shift().text || '';
                 } else {
                     final += item?.text || '';
                 }
             }
         }
         return final;
-    } else if (typeof translated === 'string') {
-        return translated;
+    } else if (typeof content === 'string') {
+        return content;
     } else {
-        return translated?.text || '';
+        return content?.text || '';
     }
 }
 
 // Get a translation via General Translation API
 // Returns string
 const _translate = async (content, code, defaultLanguage, apiKey) => {
+    if (!apiKey) {
+        throw new Error('Missing API Key!')
+    }
+    if (code === defaultLanguage) {
+        return _constructContent({ content: content });
+    }
+    const { processed, untranslated } = _processContent(content);
     try {
-        if (!apiKey) {
-            throw new Error('Missing API Key!')
-        }
-        if (code === defaultLanguage) {
-            return _constructContent(content);
-        }
-        const { processed, redacted } = _processContent(content);
         const response = await fetch('http://translate.gtx.dev', {
             method: 'POST',
             headers: {
@@ -90,11 +90,11 @@ const _translate = async (content, code, defaultLanguage, apiKey) => {
             throw new Error(`${result || response.status}`);
         } else {
             const result = await response.json();
-            return _constructContent({translated: result, redacted: redacted});
+            return _constructContent({content: result, untranslated: untranslated });
         }
     } catch (error) {
         console.error(error)
-        return _constructContent({ translated: content })
+        return _constructContent({ content: content })
     }
 }