@tstdl/base 0.92.109 → 0.92.111

package/ai/ai.service.js

@@ -41,6 +41,7 @@ const functionCallingModeMap = {
     force: GoogleFunctionCallingMode.ANY,
     none: GoogleFunctionCallingMode.NONE
 };
+let generationCounter = 0;
 let AiService = AiService_1 = class AiService {
     #options = injectArgument(this, { optional: true }) ?? inject(AiServiceOptions);
     #fileService = inject(AiFileService, this.#options);
@@ -206,7 +207,7 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
         return mergeGenerationStreamItems(items, request.generationSchema);
     }
     async *generateStream(request) {
-        this.#logger.verbose('Generating...');
+        const generationNumber = ++generationCounter;
         const googleFunctionDeclarations = isDefined(request.functions) ? await this.convertFunctions(request.functions) : undefined;
         const generationConfig = {
             maxOutputTokens: request.generationOptions?.maxOutputTokens,
@@ -229,6 +230,7 @@ Always output the content and tags in ${options?.targetLanguage ?? 'the same lan
             let generation;
             for (let i = 0;; i++) {
                 try {
+                    this.#logger.verbose(`[C:${generationNumber}] [I:${iterations + 1}] Generating...`);
                     generation = await this.getModel(model).generateContentStream({
                         generationConfig: {
                             ...generationConfig,

package/package.json

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

package/queue/postgres/queue.js

@@ -101,16 +101,24 @@ let PostgresQueue = class PostgresQueue extends Queue {
         return jobs[0];
     }
     async dequeueMany(count) {
-        const rows = await this.#repository.session
-            .update(job)
-            .set(this.#dequeueUpdate)
-            .where(inArray(job.id, this.#repository.session
+        /*
+         * Materialization required for LIMIT clause
+         * https://stackoverflow.com/questions/73966670/select-for-update-subquery-not-respecting-limit-clause-under-load
+         * https://dba.stackexchange.com/questions/69471/postgres-update-limit-1
+         */
+        const selection = this.#repository.session.$with('selection').as((qb) => qb
             .select({ id: job.id })
             .from(job)
-            .where(this.#dequeueQuery)
+            .where(and(this.#dequeueQuery, sql `pg_sleep(0) IS NOT NULL` // workaround to force materialization until drizzle implements https://github.com/drizzle-team/drizzle-orm/issues/2318
+        ))
             .orderBy(asc(job.priority), asc(job.enqueueTimestamp), asc(job.lastDequeueTimestamp), asc(job.tries))
             .limit(count)
-            .for('update', { skipLocked: true })))
+            .for('update', { skipLocked: true }));
+        const rows = await this.#repository.session
+            .with(selection)
+            .update(job)
+            .set(this.#dequeueUpdate)
+            .where(inArray(job.id, this.#repository.session.select().from(selection)))
             .returning();
         return this.#repository.mapManyToEntity(rows);
     }