generaltranslation 1.2.13 → 1.2.15

package/README.md

@@ -123,15 +123,6 @@ const translatedPrompt = await gt.translate({ text: 'Tell me a story' }, 'es');
 Translates multiple items of content into the language represented by an ISO-639 language code. Caches by default. Just wrap `translateMany` around an array of what you want to translate and specify a language. For example:
 
 ```
-const requests = [
-    {
-        content: "You say goodbye",
-        language: "es"
-    },
-    {
-        content: "And I say hello.",
-        language: "de"
-    }
-];
-const translationArray = await gt.translateMany(requests) // returns an array
+const requests = ["You say goodbye.", "And I say hello."];
+const translationArray = await gt.translateMany(requests, 'es') // returns an array
 ```

package/index.js

@@ -50,7 +50,7 @@ class GT {
     }
 
     // String translation
-    async translate(content, language, { ... options }) {
+    async translate(content, language, ...options) {
         return await _translate({
             content: content, language: language, config: this, ...options,
         });
@@ -58,9 +58,9 @@ class GT {
 
     // String translation, of an array of strings
     // requestArray looks like { content: '', language: '' }
-    async translateMany(requestArray) {
+    async translateMany(contentArray, language, ...options) {
         return await _translateMany({
-            requestArray, config: this
+            contentArray, language, config: this, ...options
         });
     }
 

package/package.json

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

package/translate/translate.js

@@ -119,23 +119,39 @@ const constructAll = (contentArray) => {
 // Get a translation of multiple strings via General Translation API
 // Returns array of strings
 const _translateMany = async ({
-    requestArray, config
+    contentArray, language, config, ...options
 }) => {
-    
+
     const apiKey = config?.apiKey;
     if (!apiKey) {
         throw new Error('Missing API Key!')
     };
 
-    const processedRequests = [];
+    const defaultLanguage = config?.defaultLanguage;
+    if (language === defaultLanguage) {
+        return constructAll(contentArray);
+    };
+
+    /*
+        // [{content, language,...options}], config 
+        ->
+        [{
+            content: processed,
+            targetLanguage: language,
+            defaultLanguage: defaultLanguage,
+            options: { ...options }
+        }]
+    */
+
+    const processedArray = [];
     const untranslatedArray = [];
 
-    for (const item of requestArray) {
-        const { processed, untranslated } = _processContent({ content: item?.content });
-        processedRequests.push({ content: processed, language: item.language, options: { ...item.options } });
+    for (const item of contentArray) {
+        const { processed, untranslated } = _processContent({ content: item });
+        processedArray.push(processed);
         untranslatedArray.push(untranslated);
-    };
-    
+    }
+
     try {
         const response = await fetch(`${config?.baseURL}/many`, {
             method: 'POST',
@@ -144,12 +160,14 @@ const _translateMany = async ({
                 'gtx-api-key': apiKey,
             },
             body: JSON.stringify({
-                processedRequests: processedRequests,
+                contentArray: processedArray,
                 targetLanguage: language,
+                defaultLanguage: defaultLanguage,
                 options: { ...options }
             })
         })
         if (!response.ok) {
+            
             const result = await response.text();
             throw new Error(`${result || response.status}`);
         } else {
@@ -157,7 +175,7 @@ const _translateMany = async ({
             if (!Array.isArray(result)) {
                 throw new Error(`${result || response.status}`);
             }
-            const returnArray = []
+            const returnArray = [];
             for (const [index, item] of result.entries()) {
                 returnArray.push(_constructContent({content: item, untranslated: untranslatedArray[index] }));
             }
@@ -165,7 +183,7 @@ const _translateMany = async ({
         }
     } catch (error) {
         console.error(error)
-        return constructAll(requestArray.map(item => item.content));
+        return constructAll(contentArray);
     }
 
 }