@tstdl/base 0.93.32 → 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/decorators.js

@@ -177,7 +177,7 @@ export function ParadeIndex(options) {
     return createDecorator({ class: true, property: true }, (data, metadata) => {
         match(metadata.metadataType)
             .with('type', () => {
-            const existing = (metadata.data.tryGet('orm') ?? {}).paradeIndex;
+            const existing = metadata.data.tryGet('orm')?.paradeIndex;
             const merged = merge(existing, options);
             return createTableDecorator({ paradeIndex: merged })(data.constructor);
         })

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/orm/server/transactional.d.ts

@@ -22,7 +22,7 @@ declare const getCurrentTransactionalContext: {
 export { getCurrentTransactionalContext, isInTransactionalContext, runInTransactionalContext };
 export declare abstract class Transactional<ContextData = unknown> {
     #private;
-    readonly session: PgTransaction | Database;
+    readonly session: Database | PgTransaction;
     readonly isInTransaction: boolean;
     constructor();
     /**

package/orm/sqls.d.ts

@@ -6,6 +6,8 @@ import type { Uuid } from './types.js';
 export declare const TRANSACTION_TIMESTAMP: SQL<Date>;
 /** Drizzle SQL helper for generating a random UUID (v4). Returns a Uuid string. */
 export declare const RANDOM_UUID_V4: SQL<Uuid>;
+/** Drizzle SQL helper for generating a random UUID (v7). Returns a Uuid string. */
+export declare const RANDOM_UUID_V7: SQL<Uuid>;
 /** Represents valid units for PostgreSQL interval values. */
 export type IntervalUnit = 'millennium' | 'millenniums' | 'millennia' | 'century' | 'centuries' | 'decade' | 'decades' | 'year' | 'years' | 'day' | 'days' | 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds' | 'microsecond' | 'microseconds';
 export type TsHeadlineOptions = {

package/orm/sqls.js

@@ -10,6 +10,8 @@ import { sql, Table } from 'drizzle-orm';
 export const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
 /** Drizzle SQL helper for generating a random UUID (v4). Returns a Uuid string. */
 export const RANDOM_UUID_V4 = sql `gen_random_uuid()`;
+/** Drizzle SQL helper for generating a random UUID (v7). Returns a Uuid string. */
+export const RANDOM_UUID_V7 = sql `uuidv7()`;
 export function array(values) {
     const valueString = sql.join(values, sql.raw(', '));
     return sql `ARRAY[${valueString}]`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.32",
+  "version": "0.93.34",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -143,7 +143,7 @@
     "@zxcvbn-ts/language-de": "^3.0",
     "@zxcvbn-ts/language-en": "^3.0",
     "drizzle-orm": "^0.44",
-    "file-type": "^21.0",
+    "file-type": "^21.1",
     "handlebars": "^4.7",
     "minio": "^8.0",
     "mjml": "^4.16",

package/test1.js

@@ -1,4 +1,6 @@
 import './polyfills.js';
+import { AiService } from './ai/ai.service.js';
+import { configureAiService } from './ai/module.js';
 import { Application, provideInitializer, provideModule, provideSignalHandler } from './application/index.js';
 import { migrateAuditSchema } from './audit/index.js';
 import { configureAuthenticationServer } from './authentication/server/module.js';
@@ -23,51 +25,62 @@ const config = {
 };
 async function bootstrap() {
     const injector = inject(Injector);
-    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,
+    configureAiService({
+        vertex: {
+            project: '922353391551', // insolytics-application
+            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,
+      },
     });
+  
     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);
-    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: 'vitamins' },
-            },
-            highlight: { source: 'content', includePositions: true },
-            score: true,
-        });
+    const aiService = inject(AiService);
+    const aiResult = await aiService.generate({
+        generationOptions: {
+            includeThoughts: true,
+        },
+        model: 'gemini-2.5-flash-lite',
+        contents: [{
+                role: 'user',
+                parts: [
+                    { text: 'asd' },
+                ],
+            }],
     });
-    for (const item of result) {
-        console.log(item);
-    }
-    console.log('Benchmark result:', benchmarkResult);
+    console.log('AI Result:', aiResult);
+    console.log(aiResult.content);
+    if (1 + 1 == 2)
+        process.exit(0);
 }
 Application.run('Test', [
     provideInitializer(bootstrap),