@tstdl/base 0.92.84 → 0.92.85

package/ai/ai.service.js

@@ -9,6 +9,7 @@ import { GoogleGenerativeAI } from '@google/generative-ai';
 import { NotSupportedError } from '../errors/not-supported.error.js';
 import { Singleton } from '../injector/decorators.js';
 import { inject, injectArgument } from '../injector/inject.js';
+import { getShutdownSignal } from '../process-shutdown.js';
 import { DeferredPromise } from '../promise/deferred-promise.js';
 import { LazyPromise } from '../promise/lazy-promise.js';
 import { convertToOpenApiSchema } from '../schema/converters/openapi-converter.js';
@@ -17,7 +18,9 @@ import { toArray } from '../utils/array/array.js';
 import { mapAsync } from '../utils/async-iterable-helpers/map.js';
 import { toArrayAsync } from '../utils/async-iterable-helpers/to-array.js';
 import { hasOwnProperty, objectEntries } from '../utils/object/object.js';
-import { assertDefinedPass, assertNotNullPass, isDefined, isNotNull, isUndefined } from '../utils/type-guards.js';
+import { cancelableTimeout } from '../utils/timing.js';
+import { assertDefinedPass, assertNotNullPass, isDefined, isError, isNotNull, isUndefined } from '../utils/type-guards.js';
+import { millisecondsPerSecond } from '../utils/units.js';
 import { resolveValueOrAsyncProvider } from '../utils/value-or-provider.js';
 import { AiFileService } from './ai-file.service.js';
 import { AiSession } from './ai-session.js';
@@ -211,18 +214,33 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
         let totalOutputTokens = 0;
         let totalTokens = 0;
         while (totalOutputTokens < maxTotalOutputTokens) {
-            const generation = await this.getModel(model).generateContentStream({
-                generationConfig: {
-                    ...generationConfig,
-                    maxOutputTokens: Math.min(maxModelTokens, maxTotalOutputTokens - totalOutputTokens)
-                },
-                systemInstruction: request.systemInstruction,
-                tools: (isDefined(googleFunctionDeclarations) && (googleFunctionDeclarations.length > 0)) ? [{ functionDeclarations: googleFunctionDeclarations }] : undefined,
-                toolConfig: isDefined(request.functionCallingMode)
-                    ? { functionCallingConfig: { mode: functionCallingModeMap[request.functionCallingMode] } }
-                    : undefined,
-                contents: inputContent
-            });
+            let generation;
+            for (let i = 0;; i++) {
+                try {
+                    generation = await this.getModel(model).generateContentStream({
+                        generationConfig: {
+                            ...generationConfig,
+                            maxOutputTokens: Math.min(maxModelTokens, maxTotalOutputTokens - totalOutputTokens)
+                        },
+                        systemInstruction: request.systemInstruction,
+                        tools: (isDefined(googleFunctionDeclarations) && (googleFunctionDeclarations.length > 0)) ? [{ functionDeclarations: googleFunctionDeclarations }] : undefined,
+                        toolConfig: isDefined(request.functionCallingMode)
+                            ? { functionCallingConfig: { mode: functionCallingModeMap[request.functionCallingMode] } }
+                            : undefined,
+                        contents: inputContent
+                    });
+                    break;
+                }
+                catch (error) {
+                    if ((i < 20) && isError(error) && (error['status'] == 429)) {
+                        const canceled = await cancelableTimeout(15 * millisecondsPerSecond, getShutdownSignal());
+                        if (!canceled) {
+                            continue;
+                        }
+                    }
+                    throw error;
+                }
+            }
             iterations++;
             let lastUsageMetadata;
             let candidate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.84",
+  "version": "0.92.85",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -136,7 +136,7 @@
     "type-fest": "4.35"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin": "4.0",
+    "@stylistic/eslint-plugin": "4.1",
     "@types/chroma-js": "2.4",
     "@types/koa__router": "12.0",
     "@types/luxon": "3.4",
@@ -162,7 +162,7 @@
     "@zxcvbn-ts/language-de": "^3.0",
     "@zxcvbn-ts/language-en": "^3.0",
     "chroma-js": "^2.6",
-    "drizzle-orm": "^0.39",
+    "drizzle-orm": "^0.40",
     "handlebars": "^4.7",
     "minio": "^8.0",
     "mjml": "^4.15",

package/process-shutdown.js

@@ -14,7 +14,6 @@ export function getShutdownSignal() {
     return getShutdownToken().signal;
 }
 let logger;
-// eslint-disable-next-line no-shadow
 export function setProcessShutdownLogger(shutdownLogger) {
     logger = shutdownLogger;
 }
@@ -49,7 +48,6 @@ export function initializeSignals() {
         }
     });
     for (const event of quitEvents) {
-        // eslint-disable-next-line @typescript-eslint/no-loop-func
         process.on(event, (...args) => {
             console.error(event, ...args);
             quitReason = args;
@@ -57,7 +55,6 @@ export function initializeSignals() {
         });
     }
     for (const quitSignal of quitSignals) {
-        // eslint-disable-next-line @typescript-eslint/no-loop-func
         process.on(quitSignal, (signal) => {
             logger.info(`${signal} received, quitting.`);
             requestShutdown();