@tstdl/base 0.92.36 → 0.92.38

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

@@ -1,8 +1,8 @@
 import '../polyfills.js';
-import { afterResolve, Resolvable, type resolveArgumentType } from '../injector/interfaces.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;
@@ -13,7 +13,6 @@ type File = {
 export declare class AiFileService implements Resolvable<AiFileServiceArgument> {
     #private;
     readonly [resolveArgumentType]: AiFileServiceArgument;
-    [afterResolve](): Promise<void>;
     processFile(fileInput: FileInput): Promise<FileContentPart>;
     processFiles(fileInputs: FileInput[]): Promise<FileContentPart[]>;
     getFileById(id: string): File | undefined;
@@ -21,6 +20,7 @@ export declare class AiFileService implements Resolvable<AiFileServiceArgument>
     private getFile;
     private getFiles;
     private uploadFile;
+    private getBucket;
     private waitForFileActive;
     private waitForFilesActive;
 }

package/ai/ai-file.service.js

@@ -66,7 +66,6 @@ import { AsyncEnumerable } from '../enumerable/async-enumerable.js';
 import { DetailsError } from '../errors/details.error.js';
 import { Singleton } from '../injector/decorators.js';
 import { inject, injectArgument } from '../injector/inject.js';
-import { afterResolve } from '../injector/interfaces.js';
 import { Logger } from '../logger/logger.js';
 import { createArray } from '../utils/array/array.js';
 import { formatBytes } from '../utils/format.js';
@@ -76,29 +75,12 @@ 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({ 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');
     #bucket;
-    async [afterResolve]() {
-        if (isDefined(this.#options.vertex)) {
-            const bucketName = assertDefinedPass(this.#options.vertex.bucket, 'Bucket not specified');
-            const [exists] = await this.#storage.bucket(bucketName).exists();
-            if (!exists) {
-                const [bucket] = await this.#storage.createBucket(bucketName, {
-                    lifecycle: {
-                        rule: [{
-                                action: { type: 'Delete' },
-                                condition: { age: 1 }
-                            }]
-                    }
-                });
-                this.#bucket = bucket;
-            }
-        }
-    }
     async processFile(fileInput) {
         const file = await this.getFile(fileInput);
         this.#fileMap.set(file.id, file);
@@ -146,8 +128,9 @@ let AiFileService = class AiFileService {
             }
             const fileSize = isBlob(fileInput) ? fileInput.size : (await stat(path)).size;
             this.#logger.verbose(`Uploading file "${id}" (${formatBytes(fileSize)})...`);
-            if (isDefined(this.#bucket)) {
-                const [file] = await this.#bucket.upload(path, { destination: id, contentType: mimeType });
+            if (isDefined(this.#storage)) {
+                const bucket = await this.getBucket();
+                const [file] = await bucket.upload(path, { destination: id, contentType: mimeType });
                 return {
                     id,
                     name: id,
@@ -173,6 +156,29 @@ let AiFileService = class AiFileService {
                 await result_1;
         }
     }
+    async getBucket() {
+        if (isUndefined(this.#options.vertex)) {
+            throw new Error('Not using Vertex');
+        }
+        if (isDefined(this.#bucket)) {
+            return this.#bucket;
+        }
+        const bucketName = assertDefinedPass(this.#options.vertex.bucket, 'Bucket not specified');
+        const [exists] = await this.#storage.bucket(bucketName).exists();
+        if (!exists) {
+            const [bucket] = await this.#storage.createBucket(bucketName, {
+                location: this.#options.vertex.location,
+                lifecycle: {
+                    rule: [{
+                            action: { type: 'Delete' },
+                            condition: { age: 1 }
+                        }]
+                }
+            });
+            this.#bucket = bucket;
+        }
+        return this.#bucket;
+    }
     async waitForFileActive(file) {
         if (isUndefined(this.#fileManager)) {
             return;

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);

package/package.json

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