Ensure creating tags does not throw constraint validation error, fix batch v3 job retries

Author: ericallam

apps/webapp/app/models/taskRunTag.server.ts

@@ -1,34 +1,41 @@
-import { prisma } from "~/db.server";
+import { Prisma, type PrismaClientOrTransaction } from "@trigger.dev/database";
 import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
+import cuid from "cuid";
+import { prisma } from "~/db.server";
 
 export const MAX_TAGS_PER_RUN = 10;
 
 export async function createTag({ tag, projectId }: { tag: string; projectId: string }) {
   if (tag.trim().length === 0) return;
-  return prisma.taskRunTag.upsert({
-    where: {
-      projectId_name: {
-        projectId: projectId,
-        name: tag,
-      },
-    },
-    create: {
-      name: tag,
-      friendlyId: generateFriendlyId("runtag"),
-      projectId: projectId,
-    },
-    update: {},
-  });
+
+  const friendlyId = generateFriendlyId("runtag");
+  const now = new Date();
+  const id = cuid();
+
+  return await prisma
+    .$queryRaw<Array<{ id: string; friendlyId: string; name: string; projectId: string }>>(
+      Prisma.sql`
+      INSERT INTO "TaskRunTag" ("id", "friendlyId", "name", "projectId", "createdAt")
+      VALUES (${id}, ${friendlyId}, ${tag}, ${projectId}, ${now})
+      ON CONFLICT ("projectId", "name") 
+      DO UPDATE SET "friendlyId" = "TaskRunTag"."friendlyId"
+      RETURNING "id", "friendlyId", "name", "projectId"
+    `
+    )
+    .then((rows) => rows[0]);
 }
 
-export async function getTagsForRunId({
-  friendlyId,
-  environmentId,
-}: {
-  friendlyId: string;
-  environmentId: string;
-}) {
-  const run = await prisma.taskRun.findFirst({
+export async function getTagsForRunId(
+  {
+    friendlyId,
+    environmentId,
+  }: {
+    friendlyId: string;
+    environmentId: string;
+  },
+  db: PrismaClientOrTransaction
+) {
+  const run = await db.taskRun.findFirst({
     where: {
       friendlyId,
       runtimeEnvironmentId: environmentId,

apps/webapp/app/v3/services/batchTriggerV3.server.ts

@@ -682,7 +682,7 @@ export class BatchTriggerV3Service extends BaseService {
           count:
             options.strategy === "sequential"
               ? options.range.count
-              : options.range.count - result.workingIndex - options.range.start,
+              : options.range.count - (result.workingIndex - options.range.start),
         },
         attemptCount: $attemptCount,
         strategy: options.strategy,

references/v3-catalog/src/trigger/batch.ts

@@ -41,6 +41,7 @@ export const batchParentTask = task({
       },
       options: {
         idempotencyKey: `item${i}`,
+        tags: ["foo:bar", "bar:baz"],
       },
     }));