@tstdl/base 0.92.32 → 0.92.35

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

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

package/ai/ai.service.d.ts

@@ -12,6 +12,10 @@ export type SpecializedGenerationResultGenerator<T> = AsyncGenerator<T> & {
 };
 export declare class AiServiceOptions {
     apiKey: string;
+    vertex?: {
+        project: string;
+        location: string;
+    };
     defaultModel?: AiModel;
 }
 export type AiServiceArgument = AiServiceOptions;

package/ai/ai.service.js

@@ -4,7 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { FinishReason, FunctionCallingMode as GoogleFunctionCallingMode, GoogleGenerativeAI } from '@google/generative-ai';
+import { FinishReason, FunctionCallingMode as GoogleFunctionCallingMode, VertexAI } from '@google-cloud/vertexai';
+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';
@@ -23,6 +24,7 @@ import { AiSession } from './ai-session.js';
 import { isSchemaFunctionDeclarationWithHandler } from './types.js';
 export class AiServiceOptions {
     apiKey;
+    vertex;
     defaultModel;
 }
 ;
@@ -34,7 +36,9 @@ const functionCallingModeMap = {
 let AiService = class AiService {
     #options = injectArgument(this, { optional: true }) ?? inject(AiServiceOptions);
     #fileService = inject(AiFileService, this.#options);
-    #genAI = new GoogleGenerativeAI(this.#options.apiKey);
+    #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));
     defaultModel = this.#options.defaultModel ?? 'gemini-2.0-flash-exp';
     createSession() {
         return new AiSession(this);
@@ -195,7 +199,6 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
             topK: request.generationOptions?.topK,
             responseMimeType: isDefined(request.generationSchema) ? 'application/json' : undefined,
             responseSchema: isDefined(request.generationSchema) ? convertToOpenApiSchema(request.generationSchema) : undefined,
-            presencePenalty: request.generationOptions?.presencePenalty,
             frequencyPenalty: request.generationOptions?.frequencyPenalty
         };
         const inputContent = this.convertContents(request.contents);
@@ -211,7 +214,7 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
                     maxOutputTokens: Math.min(8192, maxTotalOutputTokens - totalOutputTokens)
                 },
                 systemInstruction: request.systemInstruction,
-                tools: isDefined(googleFunctionDeclarations) ? [{ functionDeclarations: googleFunctionDeclarations }] : undefined,
+                tools: (isDefined(googleFunctionDeclarations) && (googleFunctionDeclarations.length > 0)) ? [{ functionDeclarations: googleFunctionDeclarations }] : undefined,
                 toolConfig: isDefined(request.functionCallingMode)
                     ? { functionCallingConfig: { mode: functionCallingModeMap[request.functionCallingMode] } }
                     : undefined,

package/ai/types.d.ts

@@ -58,7 +58,6 @@ export type GenerationOptions = {
     temperature?: number;
     topP?: number;
     topK?: number;
-    presencePenalty?: number;
     frequencyPenalty?: number;
 };
 export type GenerationRequest = {

package/document-management/api/document-management.api.d.ts

@@ -32,8 +32,8 @@ export declare const documentManagementApiDefinition: {
             resource: string;
             method: "GET";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                readonly id: string;
                 readonly title: string | null;
+                readonly id: string;
                 readonly download?: boolean | undefined;
             }>;
             result: Uint8ArrayConstructor;
@@ -43,8 +43,8 @@ export declare const documentManagementApiDefinition: {
             resource: string;
             method: "GET";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                readonly id: string;
                 readonly title: string | null;
+                readonly id: string;
                 readonly download?: boolean | undefined;
             }>;
             result: import("../../schema/index.js").StringSchema;
@@ -406,8 +406,8 @@ declare const _DocumentManagementApi: import("../../api/index.js").ApiClient<{
             resource: string;
             method: "GET";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                readonly id: string;
                 readonly title: string | null;
+                readonly id: string;
                 readonly download?: boolean | undefined;
             }>;
             result: Uint8ArrayConstructor;
@@ -417,8 +417,8 @@ declare const _DocumentManagementApi: import("../../api/index.js").ApiClient<{
             resource: string;
             method: "GET";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                readonly id: string;
                 readonly title: string | null;
+                readonly id: string;
                 readonly download?: boolean | undefined;
             }>;
             result: import("../../schema/index.js").StringSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.32",
+  "version": "0.92.35",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -118,6 +118,7 @@
     "./utils/string": "./utils/string/index.js"
   },
   "dependencies": {
+    "@google-cloud/vertexai": "^1.9.2",
     "disposablestack": "1.1",
     "luxon": "^3.5",
     "reflect-metadata": "^0.2",

package/schema/converters/openapi-converter.js

@@ -89,7 +89,6 @@ function convertToOpenApiSchemaBase(schema) {
             const enumSchema = convertToOpenApiSchema(schema.schema);
             return {
                 ...enumSchema,
-                enum: [...enumSchema.enum, null],
                 nullable: true
             };
         }

package/utils/comparison.d.ts

@@ -4,5 +4,5 @@ export declare function compareByValueSelectionOrdered<T>(...selectors: (readonl
 export declare function compareByValueToOrder<T>(order: T[]): (a: T, b: T) => number;
 export declare const orderRest: unique symbol;
 export declare function compareByValueSelectionToOrder<T, TSelect>(order: (TSelect | typeof orderRest)[], selector: (item: T) => TSelect): (a: T, b: T) => number;
-export declare function compareByValue<T>(a: T, b: T): number;
-export declare function compareByValueDescending<T>(a: T, b: T): number;
+export declare function compareByValue<T>(a: T, b: T, strict?: boolean): number;
+export declare function compareByValueDescending<T>(a: T, b: T, strict?: boolean): number;

package/utils/comparison.js

@@ -58,7 +58,7 @@ export function compareByValueSelectionToOrder(order, selector) {
         return compareByValue(indexA, indexB);
     };
 }
-export function compareByValue(a, b) {
+export function compareByValue(a, b, strict = true) {
     if (a === b) {
         return 0;
     }
@@ -68,9 +68,12 @@ export function compareByValue(a, b) {
     else if (b > a) {
         return -1;
     }
-    throw new Error('objects not comparable');
+    if (!strict) {
+        return 0;
+    }
+    throw new Error('Objects not comparable');
 }
-export function compareByValueDescending(a, b) {
+export function compareByValueDescending(a, b, strict = true) {
     if (a === b) {
         return 0;
     }
@@ -80,5 +83,8 @@ export function compareByValueDescending(a, b) {
     else if (b > a) {
         return 1;
     }
-    throw new Error('objects not comparable');
+    if (!strict) {
+        return 0;
+    }
+    throw new Error('Objects not comparable');
 }