Add ability to globally configure the task machine preset

Author: ericallam

apps/webapp/app/env.server.ts

@@ -193,13 +193,14 @@ const EnvironmentSchema = z.object({
   USAGE_EVENT_URL: z.string().optional(),
   PROD_USAGE_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
 
-  CENTS_PER_HOUR_MICRO: z.coerce.number().positive().default(0),
-  CENTS_PER_HOUR_SMALL_1X: z.coerce.number().positive().default(0),
-  CENTS_PER_HOUR_SMALL_2X: z.coerce.number().positive().default(0),
-  CENTS_PER_HOUR_MEDIUM_1X: z.coerce.number().positive().default(0),
-  CENTS_PER_HOUR_MEDIUM_2X: z.coerce.number().positive().default(0),
-  CENTS_PER_HOUR_LARGE_1X: z.coerce.number().positive().default(0),
-  BASE_RUN_COST_IN_CENTS: z.coerce.number().positive().default(0),
+  CENTS_PER_HOUR_MICRO: z.coerce.number().default(0),
+  CENTS_PER_HOUR_SMALL_1X: z.coerce.number().default(0),
+  CENTS_PER_HOUR_SMALL_2X: z.coerce.number().default(0),
+  CENTS_PER_HOUR_MEDIUM_1X: z.coerce.number().default(0),
+  CENTS_PER_HOUR_MEDIUM_2X: z.coerce.number().default(0),
+  CENTS_PER_HOUR_LARGE_1X: z.coerce.number().default(0),
+  CENTS_PER_HOUR_LARGE_2X: z.coerce.number().default(0),
+  BASE_RUN_COST_IN_CENTS: z.coerce.number().default(0),
 
   USAGE_OPEN_METER_API_KEY: z.string().optional(),
   USAGE_OPEN_METER_BASE_URL: z.string().optional(),

apps/webapp/app/v3/machinePresets.server.ts

@@ -33,6 +33,11 @@ export const presets = {
     memory: 8,
     centsPerMs: env.CENTS_PER_HOUR_LARGE_1X / 3_600_000,
   },
+  "large-2x": {
+    cpu: 8,
+    memory: 16,
+    centsPerMs: env.CENTS_PER_HOUR_LARGE_2X / 3_600_000,
+  },
 };
 
 export function machinePresetFromConfig(config: unknown): MachinePreset {

apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts

@@ -413,6 +413,7 @@ export class SharedQueueConsumer {
             lockedToVersionId: deployment.worker.id,
             startedAt: existingTaskRun.startedAt ?? new Date(),
             baseCostInCents: env.BASE_RUN_COST_IN_CENTS,
+            machinePreset: machinePresetFromConfig(backgroundTask.machineConfig ?? {}).name,
           },
           include: {
             runtimeEnvironment: true,

packages/cli-v3/src/workers/prod/worker-facade.ts

@@ -223,11 +223,27 @@ const prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
 
 runtime.setGlobalRuntimeManager(prodRuntimeManager);
 
-const TASK_METADATA = taskCatalog.getAllTaskMetadata();
+let taskMetadata = taskCatalog.getAllTaskMetadata();
+
+if (typeof importedConfig?.machine === "string") {
+  // Set the machine preset on all tasks that don't have it
+  taskMetadata = taskMetadata.map((task) => {
+    if (typeof task.machine?.preset !== "string") {
+      return {
+        ...task,
+        machine: {
+          preset: importedConfig.machine,
+        },
+      };
+    }
+
+    return task;
+  });
+}
 
-zodIpc.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
+zodIpc.send("TASKS_READY", { tasks: taskMetadata }).catch((err) => {
   if (err instanceof ZodSchemaParsedError) {
-    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
+    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: taskMetadata });
   } else {
     console.error("Failed to send TASKS_READY message", err);
   }

packages/core/src/v3/schemas/common.ts

@@ -31,6 +31,7 @@ export const MachinePresetName = z.enum([
   "medium-1x",
   "medium-2x",
   "large-1x",
+  "large-2x",
 ]);
 
 export type MachinePresetName = z.infer<typeof MachinePresetName>;

packages/core/src/v3/types/config.ts

@@ -1,6 +1,6 @@
 import { FailureFnParams, InitFnParams, StartFnParams, SuccessFnParams } from ".";
 import { LogLevel } from "../logger/taskLogger";
-import { RetryOptions } from "../schemas";
+import { MachinePresetName, RetryOptions } from "../schemas";
 import type { InstrumentationOption } from "@opentelemetry/instrumentation";
 
 export interface ProjectConfig {
@@ -13,6 +13,12 @@ export interface ProjectConfig {
   };
   additionalPackages?: string[];
 
+  /**
+   * The default machine preset to use for your deployed trigger.dev tasks. You can override this on a per-task basis.
+   * @default "small-1x"
+   */
+  machine?: MachinePresetName;
+
   /**
    * List of additional files to include in your trigger.dev bundle. e.g. ["./prisma/schema.prisma"]
    *

packages/database/prisma/migrations/20240613082558_add_machine_preset_to_task_run/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TaskRun" ADD COLUMN     "machinePreset" TEXT;

packages/database/prisma/schema.prisma

@@ -1644,7 +1644,8 @@ model TaskRun {
   tags        TaskTag[]
   checkpoints Checkpoint[]
 
-  startedAt DateTime?
+  startedAt     DateTime?
+  machinePreset String?
 
   usageDurationMs Int   @default(0)
   costInCents     Float @default(0)

references/v3-catalog/trigger.config.ts

@@ -34,6 +34,7 @@ export const resolveEnvVars: ResolveEnvironmentVariablesFunction = async ({
 
 export const config: TriggerConfig = {
   project: "yubjwjsfkxnylobaqvqz",
+  machine: "small-2x",
   retries: {
     enabledInDev: true,
     default: {