Another attempt at fixing createTag, this time doing retries in code on conflicts

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

@@ -1,24 +1,44 @@
+import { Prisma } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
 import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
 
 export const MAX_TAGS_PER_RUN = 10;
+const MAX_RETRIES = 3;
 
 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: {},
-  });
+
+  let attempts = 0;
+  const friendlyId = generateFriendlyId("runtag");
+
+  while (attempts < MAX_RETRIES) {
+    try {
+      return await prisma.taskRunTag.upsert({
+        where: {
+          projectId_name: {
+            projectId,
+            name: tag,
+          },
+        },
+        create: {
+          friendlyId,
+          name: tag,
+          projectId,
+        },
+        update: {},
+      });
+    } catch (error) {
+      if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002") {
+        // Handle unique constraint violation (conflict)
+        attempts++;
+        if (attempts >= MAX_RETRIES) {
+          throw new Error(`Failed to create tag after ${MAX_RETRIES} attempts due to conflicts.`);
+        }
+      } else {
+        throw error; // Re-throw other errors
+      }
+    }
+  }
 }
 
 export async function getTagsForRunId({

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"],
       },
     }));