@tstdl/base 0.92.2 → 0.92.3

package/ai/ai.service.d.ts

@@ -2,7 +2,7 @@ import '../polyfills.js';
 import { GoogleGenerativeAI } from '@google/generative-ai';
 import { type FileMetadataResponse, GoogleAIFileManager } from '@google/generative-ai/server';
 import { Resolvable, type resolveArgumentType } from '../injector/interfaces.js';
-import { SchemaTestable } from '../schema/index.js';
+import { OneOrMany, SchemaTestable } from '../schema/index.js';
 import { Enumeration as EnumerationType, EnumerationValue } from '../types.js';
 import { LiteralUnion } from 'type-fest';
 export type FileInput = {
@@ -22,15 +22,15 @@ export declare class AiService implements Resolvable<AiServiceArgument> {
     readonly model: import("@google/generative-ai").GenerativeModel;
     readonly [resolveArgumentType]: AiServiceArgument;
     getFile(fileInput: FileInput): Promise<FileMetadataResponse>;
-    getFiles(files: FileInput[]): Promise<FileMetadataResponse[]>;
-    classify<T extends EnumerationType>(fileInput: FileInput, types: T): Promise<{
+    getFiles(files: readonly FileInput[]): Promise<FileMetadataResponse[]>;
+    classify<T extends EnumerationType>(fileInput: OneOrMany<FileInput>, types: T): Promise<{
         reasoning: string;
         types: {
             type: EnumerationValue<T>;
             confidence: 'high' | 'medium' | 'low';
         }[] | null;
     }>;
-    extractData<T>(fileInput: FileInput, schema: SchemaTestable<T>): Promise<T>;
+    extractData<T>(fileInput: OneOrMany<FileInput>, schema: SchemaTestable<T>): Promise<T>;
     waitForFileActive(fileMetadata: FileMetadataResponse): Promise<FileMetadataResponse>;
     waitForFilesActive(...files: FileMetadataResponse[]): Promise<FileMetadataResponse[]>;
 }

package/ai/ai.service.js

@@ -68,6 +68,7 @@ import { Singleton } from '../injector/decorators.js';
 import { injectArgument } from '../injector/inject.js';
 import { convertToOpenApiSchema } from '../schema/converters/openapi-converter.js';
 import { array, enumeration, nullable, object, Schema, string } from '../schema/index.js';
+import { toArray } from '../utils/array/array.js';
 import { digest } from '../utils/cryptography.js';
 import { timeout } from '../utils/timing.js';
 import { tryIgnoreAsync } from '../utils/try-ignore.js';
@@ -130,7 +131,7 @@ let AiService = class AiService {
         return Promise.all(files.map(async (file) => this.getFile(file)));
     }
     async classify(fileInput, types) {
-        const file = await this.getFile(fileInput);
+        const files = await this.getFiles(toArray(fileInput));
         const resultSchema = object({
             reasoning: string({ description: 'Reasoning for classification. Use to be more confident, if unsure. Reason for every somewhat likely document type.' }),
             types: nullable(array(object({
@@ -151,7 +152,7 @@ let AiService = class AiService {
                 {
                     role: 'user',
                     parts: [
-                        { fileData: { mimeType: file.mimeType, fileUri: file.uri } },
+                        ...files.map((file) => ({ fileData: { mimeType: file.mimeType, fileUri: file.uri } })),
                         { text: `Classify the document. Output as JSON using the following schema:\n${JSON.stringify(responseSchema, null, 2)}\n\nIf none of the provided document types are a suitable match, return null for types.` }
                     ]
                 }
@@ -160,7 +161,7 @@ let AiService = class AiService {
         return resultSchema.parse(JSON.parse(result.response.text()));
     }
     async extractData(fileInput, schema) {
-        const file = await this.getFile(fileInput);
+        const files = await this.getFiles(toArray(fileInput));
         const responseSchema = convertToOpenApiSchema(schema);
         const result = await this.model.generateContent({
             generationConfig: {
@@ -182,7 +183,7 @@ You *MUST* output the reasoning first.`,
                 {
                     role: 'user',
                     parts: [
-                        { fileData: { mimeType: file.mimeType, fileUri: file.uri } },
+                        ...files.map((file) => ({ fileData: { mimeType: file.mimeType, fileUri: file.uri } })),
                         { text: `Classify the document. Output as JSON using the following schema:\n${JSON.stringify(responseSchema, null, 2)}` }
                     ]
                 }

package/package.json

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