@adminforth/i18n 2.3.0 → 2.3.2

package/build.log

@@ -20,5 +20,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 47,968 bytes  received 305 bytes  96,546.00 bytes/sec
-total size is 46,800  speedup is 0.97
+sent 48,185 bytes  received 305 bytes  96,980.00 bytes/sec
+total size is 47,033  speedup is 0.97

package/custom/TranslationJobViewComponent.vue

@@ -82,6 +82,7 @@ const props = defineProps<{
   meta: any;
   getJobTasks: (limit?: number, offset?: number, fieldsToReturn?: string[]) => Promise<
   {state: Record<string, any>, status: string}[]>;
+  tasksStorageLost?: boolean;
   job: {
     id: string;
     name: string;
@@ -115,6 +116,11 @@ async function loadPage(targetPage: number) {
       } catch (error) {
         console.error('Failed to fetch translation tasks, retrying...', error);
       }
+      // the task storage of the job was deleted, tasks will never come back, so retrying only keeps the
+      // spinner on screen for nothing
+      if (props.tasksStorageLost) {
+        break;
+      }
       if (retry < retries - 1) {
         await new Promise(resolve => setTimeout(resolve, RETRY_DELAY_MS));
       }

package/dist/custom/TranslationJobViewComponent.vue

@@ -82,6 +82,7 @@ const props = defineProps<{
   meta: any;
   getJobTasks: (limit?: number, offset?: number, fieldsToReturn?: string[]) => Promise<
   {state: Record<string, any>, status: string}[]>;
+  tasksStorageLost?: boolean;
   job: {
     id: string;
     name: string;
@@ -115,6 +116,11 @@ async function loadPage(targetPage: number) {
       } catch (error) {
         console.error('Failed to fetch translation tasks, retrying...', error);
       }
+      // the task storage of the job was deleted, tasks will never come back, so retrying only keeps the
+      // spinner on screen for nothing
+      if (props.tasksStorageLost) {
+        break;
+      }
       if (retry < retries - 1) {
         await new Promise(resolve => setTimeout(resolve, RETRY_DELAY_MS));
       }

package/dist/index.js

@@ -586,10 +586,32 @@ export default class I18nPlugin extends AdminForthPlugin {
             const maxInputTokens = (_a = this.options.inputTokensPerBatch) !== null && _a !== void 0 ? _a : 30000;
             const limit = pLimit(30);
             const enStringsTokenLengthCache = {};
+            let tokenCountingFailed = false;
+            // Counting tokens is only used to split requests into batches. Some completion
+            // adapters cannot provide a token count, so use a conservative estimate instead
+            // of preventing the translation job from being created.
+            const getTokenLength = (value) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const tokenLength = yield this.options.completeAdapter.measureTokensCount(value);
+                    if (!Number.isFinite(tokenLength) || tokenLength < 0) {
+                        throw new Error(`Invalid token count: ${tokenLength}`);
+                    }
+                    return tokenLength;
+                }
+                catch (error) {
+                    if (!tokenCountingFailed) {
+                        tokenCountingFailed = true;
+                        afLogger.warn(`Could not count tokens for translation batches in plugin ${this.constructor.name}; using a character-based estimate instead: ${String(error)}`);
+                    }
+                    // English text normally uses about 4 characters per token. Three gives
+                    // batches some extra headroom for JSON formatting and unusual characters.
+                    return Math.max(1, Math.ceil(value.length / 3));
+                }
+            });
             const tokenLengthPerString = (_a) => __awaiter(this, [_a], void 0, function* ({ str, id }) {
                 const objectToPush = {
                     en_string: str,
-                    numOfTokens: yield this.options.completeAdapter.measureTokensCount(`"${str}":"", \n`)
+                    numOfTokens: yield getTokenLength(`"${str}":"", \n`)
                 };
                 enStringsTokenLengthCache[id] = objectToPush;
             });
@@ -622,7 +644,7 @@ export default class I18nPlugin extends AdminForthPlugin {
       \`\`\`
     `;
             const failedToTranslate = [];
-            const basePromptTokenLength = yield this.options.completeAdapter.measureTokensCount(basePrompt);
+            const basePromptTokenLength = yield getTokenLength(basePrompt);
             const allowedTokensAmountForFields = maxInputTokens - basePromptTokenLength;
             const stringsToTranslate = Object.fromEntries(strings.map(s => [s.id, s]));
             const generationTasksInitialData = [];

package/index.ts

@@ -698,12 +698,34 @@ export default class I18nPlugin extends AdminForthPlugin {
 
     const limit = pLimit(30); 
     const enStringsTokenLengthCache: Record<string, any> = {};
+    let tokenCountingFailed = false;
+
+    // Counting tokens is only used to split requests into batches. Some completion
+    // adapters cannot provide a token count, so use a conservative estimate instead
+    // of preventing the translation job from being created.
+    const getTokenLength = async (value: string): Promise<number> => {
+      try {
+        const tokenLength = await this.options.completeAdapter.measureTokensCount(value);
+        if (!Number.isFinite(tokenLength) || tokenLength < 0) {
+          throw new Error(`Invalid token count: ${tokenLength}`);
+        }
+        return tokenLength;
+      } catch (error) {
+        if (!tokenCountingFailed) {
+          tokenCountingFailed = true;
+          afLogger.warn(`Could not count tokens for translation batches in plugin ${this.constructor.name}; using a character-based estimate instead: ${String(error)}`);
+        }
+        // English text normally uses about 4 characters per token. Three gives
+        // batches some extra headroom for JSON formatting and unusual characters.
+        return Math.max(1, Math.ceil(value.length / 3));
+      }
+    };
     
 
     const tokenLengthPerString = async ({ str, id }: { str: string; id: string }): Promise<void> => {
       const objectToPush = {
         en_string: str,
-        numOfTokens: await this.options.completeAdapter.measureTokensCount(`"${str}":"", \n`)
+        numOfTokens: await getTokenLength(`"${str}":"", \n`)
       };
       enStringsTokenLengthCache[id] = objectToPush;
     }
@@ -741,7 +763,7 @@ export default class I18nPlugin extends AdminForthPlugin {
     `;
 
     const failedToTranslate: IFailedTranslation[] = [];
-    const basePromptTokenLength = await this.options.completeAdapter.measureTokensCount(basePrompt);
+    const basePromptTokenLength = await getTokenLength(basePrompt);
     const allowedTokensAmountForFields = maxInputTokens - basePromptTokenLength;
     const stringsToTranslate: Record<string, { id: string; en_string: string; category: string }> = Object.fromEntries(strings.map(s => [s.id, s]));
     const generationTasksInitialData = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",