Remove unnecessary prisma tx params from enqueue methods

Author: ericallam

apps/webapp/app/runEngine/services/batchTrigger.server.ts

@@ -313,7 +313,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     }
   }
 
-  async #enqueueBatchTaskRun(options: BatchProcessingOptions, tx?: PrismaClientOrTransaction) {
+  async #enqueueBatchTaskRun(options: BatchProcessingOptions) {
     await commonWorker.enqueue({
       id: `RunEngineBatchTriggerService.process:${options.batchId}:${options.processingId}`,
       job: "runengine.processBatchTaskRun",

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

@@ -891,7 +891,7 @@ export class BatchTriggerV3Service extends BaseService {
     return false;
   }
 
-  async #enqueueBatchTaskRun(options: BatchProcessingOptions, tx?: PrismaClientOrTransaction) {
+  async #enqueueBatchTaskRun(options: BatchProcessingOptions) {
     await commonWorker.enqueue({
       id: `BatchTriggerV2Service.process:${options.batchId}:${options.processingId}`,
       job: "v3.processBatchTaskRun",

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

@@ -1,10 +1,9 @@
-import { commonWorker } from "../commonWorker.server";
-import { BaseService } from "./baseService.server";
-import { PrismaClientOrTransaction } from "~/db.server";
 import { z } from "zod";
+import { findLatestSession } from "~/models/runtimeEnvironment.server";
 import { logger } from "~/services/logger.server";
+import { commonWorker } from "../commonWorker.server";
+import { BaseService } from "./baseService.server";
 import { CancelTaskRunService } from "./cancelTaskRun.server";
-import { findLatestSession } from "~/models/runtimeEnvironment.server";
 
 export const CancelDevSessionRunsServiceOptions = z.object({
   runIds: z.array(z.string()),
@@ -90,11 +89,7 @@ export class CancelDevSessionRunsService extends BaseService {
     }
   }
 
-  static async enqueue(
-    options: CancelDevSessionRunsServiceOptions,
-    runAt?: Date,
-    tx?: PrismaClientOrTransaction
-  ) {
+  static async enqueue(options: CancelDevSessionRunsServiceOptions, runAt?: Date) {
     return await commonWorker.enqueue({
       id: options.cancelledSessionId
         ? `cancelDevSessionRuns:${options.cancelledSessionId}`

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

@@ -482,7 +482,7 @@ export class CompleteAttemptService extends BaseService {
 
     const retryDirectly = () => {
       logger.debug("[CompleteAttemptService] Retrying attempt directly", { runId: run.id });
-      return RetryAttemptService.enqueue(run.id, this._prisma, new Date(executionRetry.timestamp));
+      return RetryAttemptService.enqueue(run.id, new Date(executionRetry.timestamp));
     };
 
     // There's a checkpoint, so we need to go through the queue

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

@@ -167,8 +167,7 @@ export class CreateDeploymentBackgroundWorkerServiceV4 extends BaseService {
         deployment.id,
         "DEPLOYING",
         "Indexing timed out",
-        new Date(Date.now() + env.DEPLOY_TIMEOUT_MS),
-        this._prisma
+        new Date(Date.now() + env.DEPLOY_TIMEOUT_MS)
       );
 
       return backgroundWorker;

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

@@ -180,7 +180,7 @@ export class ResumeDependentParentsService extends BaseService {
     }
 
     //resume the dependent task
-    await ResumeTaskDependencyService.enqueue(dependency.id, lastAttempt.id, this._prisma);
+    await ResumeTaskDependencyService.enqueue(dependency.id, lastAttempt.id);
     return {
       success: true,
       action: "resume-scheduled",

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

@@ -1,9 +1,8 @@
-import { PrismaClientOrTransaction } from "~/db.server";
+import { TaskRunDependency } from "@trigger.dev/database";
 import { logger } from "~/services/logger.server";
-import { commonWorker } from "../commonWorker.server";
 import { marqs } from "~/v3/marqs/index.server";
+import { commonWorker } from "../commonWorker.server";
 import { BaseService } from "./baseService.server";
-import { TaskRunDependency } from "@trigger.dev/database";
 
 export class ResumeTaskDependencyService extends BaseService {
   public async call(dependencyId: string, sourceTaskAttemptId: string) {
@@ -154,12 +153,7 @@ export class ResumeTaskDependencyService extends BaseService {
     }
   }
 
-  static async enqueue(
-    dependencyId: string,
-    sourceTaskAttemptId: string,
-    tx: PrismaClientOrTransaction,
-    runAt?: Date
-  ) {
+  static async enqueue(dependencyId: string, sourceTaskAttemptId: string, runAt?: Date) {
     return await commonWorker.enqueue({
       job: "v3.resumeTaskDependency",
       payload: {

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

@@ -1,8 +1,7 @@
-import { BaseService } from "./baseService.server";
 import { logger } from "~/services/logger.server";
-import { socketIo } from "../handleSocketIo.server";
-import { PrismaClientOrTransaction } from "~/db.server";
 import { commonWorker } from "../commonWorker.server";
+import { socketIo } from "../handleSocketIo.server";
+import { BaseService } from "./baseService.server";
 
 export class RetryAttemptService extends BaseService {
   public async call(runId: string) {
@@ -23,7 +22,7 @@ export class RetryAttemptService extends BaseService {
     });
   }
 
-  static async enqueue(runId: string, tx: PrismaClientOrTransaction, runAt?: Date) {
+  static async enqueue(runId: string, runAt?: Date) {
     return await commonWorker.enqueue({
       id: `retryAttempt:${runId}`,
       job: "v3.retryAttempt",

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

@@ -47,8 +47,7 @@ export class TimeoutDeploymentService extends BaseService {
     deploymentId: string,
     fromStatus: string,
     errorMessage: string,
-    runAt: Date,
-    tx?: PrismaClientOrTransaction
+    runAt: Date
   ) {
     await commonWorker.enqueue({
       id: `timeoutDeployment:${deploymentId}`,