@tstdl/base 0.93.33 → 0.93.34

package/ai/ai.service.js

@@ -205,7 +205,7 @@ let AiService = AiService_1 = class AiService {
         };
         const model = this.mapModel(request.model);
         const maxModelTokens = await this.getModelOutputTokenLimit(model);
-        const maxTotalOutputTokens = request.generationOptions?.maxOutputTokens ?? maxModelTokens;
+        const maxTotalOutputTokens = request.generationOptions?.maxOutputTokens ?? maxModelTokens ?? 8192;
         const inputContent = this.convertContents(request.contents);
         let iterations = 0;
         let totalPromptTokens = 0;
@@ -221,7 +221,7 @@ let AiService = AiService_1 = class AiService {
                         model,
                         config: {
                             ...config,
-                            maxOutputTokens: Math.min(maxModelTokens, maxTotalOutputTokens - totalOutputTokens),
+                            maxOutputTokens: Math.min(1000000, maxTotalOutputTokens - totalOutputTokens),
                         },
                         contents: inputContent,
                     });
@@ -356,7 +356,7 @@ let AiService = AiService_1 = class AiService {
             }
         }
         if (isUndefined(modelInfo.outputTokenLimit)) {
-            throw new Error(`Model ${model} does not support maxOutputTokens`);
+            return null;
         }
         return modelInfo.outputTokenLimit;
     }

package/ai/types.d.ts

@@ -137,6 +137,10 @@ export type GenerationOptions = {
      * The maximum number of tokens the model is allowed to generate for its thinking phase.
      */
     thinkingBudget?: number;
+    /**
+     * Whether to include the model's internal thoughts in the response.
+     */
+    includeThoughts?: boolean;
 };
 /**
  * A request to generate content from the AI model.

package/orm/server/repository.js

@@ -54,6 +54,9 @@ let EntityRepository = class EntityRepository extends Transactional {
     #tableWithMetadata = this.#table;
     #columnDefinitions = this.#context.columnDefinitions ?? getColumnDefinitions(this.#table);
     #columnDefinitionsMap = this.#context.columnDefinitionsMap ?? getColumnDefinitionsMap(this.#table);
+    #upsertManyExcludedMapping = fromEntries(this.#columnDefinitions
+        .filter((column) => column.name != this.#table.id.name)
+        .map((column) => [column.name, sql `excluded.${sql.identifier(this.getColumn(column).name)}`]));
     hasMetadata = typeExtends(this.type, Entity);
     /**
      * Gets the Drizzle table definition for the entity type.
@@ -593,7 +596,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         const mappedUpdate = isDefined(update)
             ? await this.mapUpdate(update)
             : {
-                ...fromEntries(this.#columnDefinitions.map((column) => [column.name, sql `excluded.${sql.identifier(this.getColumn(column).name)}`])),
+                ...this.#upsertManyExcludedMapping,
                 ...this._getMetadataUpdate(update),
             };
         const rows = await this.session

package/package.json

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

package/test1.js

@@ -28,40 +28,48 @@ async function bootstrap() {
     configureAiService({
         vertex: {
             project: '922353391551', // insolytics-application
-            location: 'europe-west3',
+            location: 'europe-west4', // netherlands
         },
         keyFile: '/home/patrick/.secret-files/insolytics-application-service-key.json',
     });
+    /*
     configureOrm({
-        repositoryConfig: {
-            schema: 'test',
-        },
-        connection: {
-            host: config.database.host,
-            port: config.database.port,
-            user: config.database.user,
-            password: config.database.pass,
-            database: config.database.database,
-        },
+      repositoryConfig: {
+        schema: 'test',
+      },
+      connection: {
+        host: config.database.host,
+        port: config.database.port,
+        user: config.database.user,
+        password: config.database.pass,
+        database: config.database.database,
+      },
     });
+  
     configureAuthenticationServer({
-        serviceOptions: {
-            secret: '6fze56uz5e6ufrtzufrtu',
-        },
+      serviceOptions: {
+        secret: '6fze56uz5e6ufrtzufrtu',
+      },
     });
+  
     configurePostgresLock();
     configurePostgresQueue();
     configurePostgresKeyValueStore();
+  
     await runInInjectionContext(injector, migratePostgresKeyValueStoreSchema);
     await runInInjectionContext(injector, migratePostgresLockSchema);
     await runInInjectionContext(injector, migratePostgresQueueSchema);
     await runInInjectionContext(injector, migrateAuditSchema);
     await runInInjectionContext(injector, migrateTestSchema);
+    */
 }
 async function main(_cancellationSignal) {
-    const repository = injectRepository(Test);
     const aiService = inject(AiService);
     const aiResult = await aiService.generate({
+        generationOptions: {
+            includeThoughts: true,
+        },
+        model: 'gemini-2.5-flash-lite',
         contents: [{
                 role: 'user',
                 parts: [
@@ -70,25 +78,9 @@ async function main(_cancellationSignal) {
             }],
     });
     console.log('AI Result:', aiResult);
+    console.log(aiResult.content);
     if (1 + 1 == 2)
         process.exit(0);
-    if (await repository.count() == 0) {
-        await repository.insertMany(testData);
-    }
-    let result;
-    const benchmarkResult = await timedBenchmarkAsync(1000, async () => {
-        result = await repository.search({
-            query: {
-                $parade: { fields: ['content'], query: 'vitumins', distance: 2 },
-            },
-            highlight: { source: 'content', includePositions: true },
-            score: true,
-        });
-    });
-    for (const item of result) {
-        console.log(item);
-    }
-    console.log('Benchmark result:', benchmarkResult);
 }
 Application.run('Test', [
     provideInitializer(bootstrap),