@tstdl/base 0.92.37 → 0.92.39

package/ai/ai-file.service.d.ts

@@ -2,7 +2,7 @@ import '../polyfills.js';
 import { Resolvable, type resolveArgumentType } from '../injector/interfaces.js';
 import { AiServiceOptions } from './ai.service.js';
 import { FileContentPart, FileInput } from './types.js';
-export type AiFileServiceOptions = Pick<AiServiceOptions, 'apiKey' | 'vertex'>;
+export type AiFileServiceOptions = Pick<AiServiceOptions, 'apiKey' | 'keyFile' | 'vertex'>;
 export type AiFileServiceArgument = AiFileServiceOptions;
 type File = {
     id: string;

package/ai/ai-file.service.js

@@ -75,8 +75,8 @@ import { assertDefinedPass, isBlob, isDefined, isUndefined } from '../utils/type
 import { millisecondsPerSecond } from '../utils/units.js';
 let AiFileService = class AiFileService {
     #options = injectArgument(this);
-    #fileManager = isUndefined(this.#options.vertex) ? new GoogleAIFileManager(this.#options.apiKey) : undefined;
-    #storage = isDefined(this.#options.vertex) ? new Storage({ projectId: this.#options.vertex.project, apiKey: this.#options.apiKey }) : undefined;
+    #fileManager = isUndefined(this.#options.vertex) ? new GoogleAIFileManager(assertDefinedPass(this.#options.apiKey, 'Api key not defined')) : undefined;
+    #storage = isDefined(this.#options.vertex) ? new Storage({ keyFile: assertDefinedPass(this.#options.keyFile, 'Key file not defined'), projectId: this.#options.vertex.project }) : undefined;
     #fileMap = new Map();
     #fileUriMap = new Map();
     #logger = inject(Logger, 'AiFileService');

package/ai/ai.service.d.ts

@@ -11,7 +11,8 @@ export type SpecializedGenerationResultGenerator<T> = AsyncGenerator<T> & {
     raw: Promise<GenerationResult>;
 };
 export declare class AiServiceOptions {
-    apiKey: string;
+    apiKey?: string;
+    keyFile?: string;
     vertex?: {
         project: string;
         location: string;

package/ai/ai.service.js

@@ -24,6 +24,7 @@ import { AiSession } from './ai-session.js';
 import { isSchemaFunctionDeclarationWithHandler } from './types.js';
 export class AiServiceOptions {
     apiKey;
+    keyFile;
     vertex;
     defaultModel;
 }
@@ -37,8 +38,8 @@ let AiService = class AiService {
     #options = injectArgument(this, { optional: true }) ?? inject(AiServiceOptions);
     #fileService = inject(AiFileService, this.#options);
     #genAI = (isDefined(this.#options.vertex)
-        ? new VertexAI({ project: this.#options.vertex.project, location: this.#options.vertex.location, googleAuthOptions: { apiKey: this.#options.apiKey } })
-        : new GoogleGenerativeAI(this.#options.apiKey));
+        ? new VertexAI({ project: this.#options.vertex.project, location: this.#options.vertex.location, googleAuthOptions: { apiKey: this.#options.apiKey, keyFile: this.#options.keyFile } })
+        : new GoogleGenerativeAI(assertDefinedPass(this.#options.apiKey, 'Api key not defined')));
     defaultModel = this.#options.defaultModel ?? 'gemini-2.0-flash-exp';
     createSession() {
         return new AiSession(this);
@@ -201,17 +202,19 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
             responseSchema: isDefined(request.generationSchema) ? convertToOpenApiSchema(request.generationSchema) : undefined,
             frequencyPenalty: request.generationOptions?.frequencyPenalty
         };
+        const model = request.model ?? this.defaultModel;
+        const maxModelTokens = model.includes('thinking') ? 65536 : 8192;
+        const maxTotalOutputTokens = request.generationOptions?.maxOutputTokens ?? maxModelTokens;
         const inputContent = this.convertContents(request.contents);
-        const maxTotalOutputTokens = request.generationOptions?.maxOutputTokens ?? 8192;
         let iterations = 0;
         let totalPromptTokens = 0;
         let totalOutputTokens = 0;
         let totalTokens = 0;
         while (totalOutputTokens < maxTotalOutputTokens) {
-            const generation = await this.getModel(request.model ?? this.defaultModel).generateContentStream({
+            const generation = await this.getModel(model).generateContentStream({
                 generationConfig: {
                     ...generationConfig,
-                    maxOutputTokens: Math.min(8192, maxTotalOutputTokens - totalOutputTokens)
+                    maxOutputTokens: Math.min(maxModelTokens, maxTotalOutputTokens - totalOutputTokens)
                 },
                 systemInstruction: request.systemInstruction,
                 tools: (isDefined(googleFunctionDeclarations) && (googleFunctionDeclarations.length > 0)) ? [{ functionDeclarations: googleFunctionDeclarations }] : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.37",
+  "version": "0.92.39",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"