Skip to content

Commit d855d55

Browse files
ericallamericallam
authored
re2: env based queue selection algo (#1775)
* re2: fix @trigger.dev/core exports * re2: WIP env based queue selection algo * more wip * WIP * Get run engine tests to pass * Adding tests for the fair dequeueing strat in the run engine * Configure the new queue selection strategy in the webapp and get it all building and typechecks passing * webapp now uses built packages, building redis-worker, run-engine, database, using better tsconfig setups for tests, moving isomorphic code into core/v3/isomorphic * Fixed webapp typechecks * dev now depends on build, fixed supervisor typecheck * Fixed run engine tests * Fixed e2e tests
1 parent 38ddd83 commit d855d55

File tree

149 files changed

+4511
-2867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+4511
-2867
lines changed

‎.eslintrc.js

-14
This file was deleted.

‎.vscode/launch.json

+8
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,14 @@
141141
"command": "pnpm run test --filter @internal/run-engine",
142142
"cwd": "${workspaceFolder}",
143143
"sourceMaps": true
144+
},
145+
{
146+
"type": "node-terminal",
147+
"request": "launch",
148+
"name": "Debug RunQueue tests",
149+
"command": "pnpm run test ./src/engine/tests/waitpoints.test.ts",
150+
"cwd": "${workspaceFolder}/internal-packages/run-engine",
151+
"sourceMaps": true
144152
}
145153
]
146154
}

‎apps/supervisor/tsconfig.json

-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@
44
"compilerOptions": {
55
"rootDir": "src",
66
"outDir": "dist"
7-
},
8-
"paths": {
9-
"@trigger.dev/core/v3": ["../../packages/core/src/v3"],
10-
"@trigger.dev/core/v3/*": ["../../packages/core/src/v3/*"]
117
}
128
}

‎apps/webapp/.eslintrc

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
2-
"plugins": [
3-
"@trigger.dev/eslint-plugin",
4-
"react-hooks",
5-
"@typescript-eslint/eslint-plugin",
6-
"import"
7-
],
2+
"plugins": ["react-hooks", "@typescript-eslint/eslint-plugin", "import"],
83
"parser": "@typescript-eslint/parser",
94
"overrides": [
105
{

‎apps/webapp/app/components/run/TriggerDetail.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
RunPanelIconSection,
1212
RunPanelProperties,
1313
} from "./RunCard";
14-
import { DisplayProperty } from "@trigger.dev/core";
14+
import type { DisplayProperty } from "@trigger.dev/core";
1515

1616
export function TriggerDetail({
1717
trigger,

‎apps/webapp/app/entry.server.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
OperatingSystemContextProvider,
1515
OperatingSystemPlatform,
1616
} from "./components/primitives/OperatingSystemProvider";
17-
import { getSharedSqsEventConsumer } from "./services/events/sqsEventConsumer";
17+
import { getSharedSqsEventConsumer } from "./services/events/sqsEventConsumer.server";
1818
import { singleton } from "./utils/singleton";
1919

2020
const ABORT_DELAY = 30000;

‎apps/webapp/app/env.server.ts

+6
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,12 @@ const EnvironmentSchema = z.object({
419419
RUN_ENGINE_TIMEOUT_EXECUTING: z.coerce.number().int().default(60_000),
420420
RUN_ENGINE_TIMEOUT_EXECUTING_WITH_WAITPOINTS: z.coerce.number().int().default(60_000),
421421
RUN_ENGINE_DEBUG_WORKER_NOTIFICATIONS: z.coerce.boolean().default(false),
422+
RUN_ENGINE_PARENT_QUEUE_LIMIT: z.coerce.number().int().default(1000),
423+
RUN_ENGINE_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),
424+
RUN_ENGINE_AVAILABLE_CAPACITY_BIAS: z.coerce.number().default(0.3),
425+
RUN_ENGINE_QUEUE_AGE_RANDOMIZATION_BIAS: z.coerce.number().default(0.25),
426+
RUN_ENGINE_REUSE_SNAPSHOT_COUNT: z.coerce.number().int().default(0),
427+
RUN_ENGINE_MAXIMUM_ENV_COUNT: z.coerce.number().int().optional(),
422428

423429
RUN_ENGINE_WORKER_REDIS_HOST: z
424430
.string()

‎apps/webapp/app/hooks/useSyncTraceRuns.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Prettify } from "@trigger.dev/core";
1+
import type { Prettify } from "@trigger.dev/core";
22
import { TaskRun } from "@trigger.dev/database";
33
import { SyncedShapeData, useSyncedShape } from "./useSyncedShape";
44

‎apps/webapp/app/presenters/HttpEndpointPresenter.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from "zod";
22
import { PrismaClient, prisma } from "~/db.server";
33
import { sortEnvironments } from "~/utils/environmentSort";
4-
import { httpEndpointUrl } from "~/services/httpendpoint/HandleHttpEndpointService";
4+
import { httpEndpointUrl } from "~/services/httpendpoint/HandleHttpEndpointService.server";
55
import { getSecretStore } from "~/services/secrets/secretStore.server";
66
import { projectPath } from "~/utils/pathBuilder";
77

‎apps/webapp/app/presenters/v3/SpanPresenter.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { eventRepository } from "~/v3/eventRepository.server";
1111
import { machinePresetFromName } from "~/v3/machinePresets.server";
1212
import { FINAL_ATTEMPT_STATUSES, isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
1313
import { BasePresenter } from "./basePresenter.server";
14-
import { getMaxDuration } from "@trigger.dev/core/v3/apps";
14+
import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
1515
import { logger } from "~/services/logger.server";
1616
import { getTaskEventStoreTableForRun, TaskEventStoreTable } from "~/v3/taskEventStore.server";
1717
import { Pi } from "lucide-react";

‎apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { logger } from "~/services/logger.server";
2020
import { BasePresenter } from "./basePresenter.server";
2121
import { TaskRunStatus } from "~/database-types";
2222
import { concurrencyTracker } from "~/v3/services/taskRunConcurrencyTracker.server";
23-
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
23+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
2424

2525
export type Task = {
2626
slug: string;

‎apps/webapp/app/routes/api.v1.$endpointSlug.schedules.$id.registrations.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { RegisterScheduleBodySchema, RegisterScheduleResponseBodySchema } from "@trigger.dev/core";
3+
import {
4+
RegisterScheduleBodySchema,
5+
RegisterScheduleResponseBodySchema,
6+
} from "@trigger.dev/core/schemas";
47
import { z } from "zod";
58
import { authenticateApiRequest } from "~/services/apiAuth.server";
69
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.$endpointSlug.sources.$id.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { UpdateTriggerSourceBodyV1Schema } from "@trigger.dev/core";
3+
import { UpdateTriggerSourceBodyV1Schema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.$endpointSlug.triggers.$id.registrations.$key.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { RegisterTriggerBodySchemaV1 } from "@trigger.dev/core";
3+
import { RegisterTriggerBodySchemaV1 } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.$endpointSlug.triggers.$id.registrations.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { InitializeTriggerBodySchema } from "@trigger.dev/core";
3+
import { InitializeTriggerBodySchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.accounts.$accountId.connections.$clientSlug/route.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { CreateExternalConnectionBodySchema, ErrorWithStackSchema } from "@trigger.dev/core";
3+
import {
4+
CreateExternalConnectionBodySchema,
5+
ErrorWithStackSchema,
6+
} from "@trigger.dev/core/schemas";
47
import { z } from "zod";
58
import { generateErrorMessage } from "zod-error";
69
import { authenticateApiRequest } from "~/services/apiAuth.server";

‎apps/webapp/app/routes/api.v1.endpointindex.$indexId.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { GetEndpointIndexResponse, GetEndpointIndexResponseSchema } from "@trigger.dev/core";
1+
import {
2+
GetEndpointIndexResponse,
3+
GetEndpointIndexResponseSchema,
4+
} from "@trigger.dev/core/schemas";
25
import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
36
import { z } from "zod";
47
import { prisma } from "~/db.server";

‎apps/webapp/app/routes/api.v1.event-dispatchers.ephemeral.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import {
4-
EphemeralEventDispatcherRequestBodySchema,
5-
InvokeJobRequestBodySchema,
6-
} from "@trigger.dev/core";
7-
import { z } from "zod";
3+
import { EphemeralEventDispatcherRequestBodySchema } from "@trigger.dev/core/schemas";
84
import { PrismaErrorSchema } from "~/db.server";
95
import { authenticateApiRequest } from "~/services/apiAuth.server";
106
import { CreateEphemeralEventDispatcherService } from "~/services/dispatchers/createEphemeralEventDispatcher.server";
11-
import { InvokeJobService } from "~/services/jobs/invokeJob.server";
127
import { logger } from "~/services/logger.server";
138

149
export async function action({ request, params }: ActionFunctionArgs) {

‎apps/webapp/app/routes/api.v1.events.$eventId.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { GetEvent } from "@trigger.dev/core";
3+
import { GetEvent } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { prisma } from "~/db.server";
66
import { runOriginalStatus } from "~/models/jobRun.server";

‎apps/webapp/app/routes/api.v1.events.bulk.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { SendBulkEventsBodySchema } from "@trigger.dev/core";
3+
import { SendBulkEventsBodySchema } from "@trigger.dev/core/schemas";
44
import { generateErrorMessage } from "zod-error";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { IngestSendEvent } from "~/services/events/ingestSendEvent.server";

‎apps/webapp/app/routes/api.v1.events.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { SendEventBodySchema } from "@trigger.dev/core";
3+
import { SendEventBodySchema } from "@trigger.dev/core/schemas";
44
import { generateErrorMessage } from "zod-error";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { IngestSendEvent } from "~/services/events/ingestSendEvent.server";

‎apps/webapp/app/routes/api.v1.http-endpoints.$httpEndpointId.env.$envType.$shortcode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-r
22
import {
33
HandleHttpEndpointService,
44
HttpEndpointParamsSchema,
5-
} from "~/services/httpendpoint/HandleHttpEndpointService";
5+
} from "~/services/httpendpoint/HandleHttpEndpointService.server";
66
import { logger } from "~/services/logger.server";
77

88
export async function action({ request, params }: ActionFunctionArgs) {

‎apps/webapp/app/routes/api.v1.jobs.$jobSlug.invoke.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { InvokeJobRequestBodySchema } from "@trigger.dev/core";
3+
import { InvokeJobRequestBodySchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { PrismaErrorSchema } from "~/db.server";
66
import { authenticateApiRequest } from "~/services/apiAuth.server";

‎apps/webapp/app/routes/api.v1.runs.$runId.logs/route.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { LogMessageSchema } from "@trigger.dev/core";
3+
import { LogMessageSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { CreateRunLogService } from "./CreateRunLogService.server";

‎apps/webapp/app/routes/api.v1.runs.$runId.statuses.$id/route.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { JobRunStatusRecordSchema, StatusUpdateSchema } from "@trigger.dev/core";
3+
import { JobRunStatusRecordSchema, StatusUpdateSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.runs.$runId.statuses.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { JobRunStatusRecordSchema } from "@trigger.dev/core";
3+
import { JobRunStatusRecordSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { prisma } from "~/db.server";
66
import { runOriginalStatus } from "~/models/jobRun.server";

‎apps/webapp/app/routes/api.v1.runs.$runId.tasks.$id.complete/route.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import type { CompleteTaskBodyOutput } from "@trigger.dev/core";
3+
import type { CompleteTaskBodyOutput } from "@trigger.dev/core/schemas";
44
import {
5-
API_VERSIONS,
65
CompleteTaskBodyInputSchema,
76
CompleteTaskBodyV2InputSchema,
8-
} from "@trigger.dev/core";
7+
} from "@trigger.dev/core/schemas";
98
import { z } from "zod";
109
import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
1110
import { authenticateApiRequest } from "~/services/apiAuth.server";
@@ -14,6 +13,11 @@ import { startActiveSpan } from "~/v3/tracer.server";
1413
import { parseRequestJsonAsync } from "~/utils/parseRequestJson.server";
1514
import { FailRunTaskService } from "../api.v1.runs.$runId.tasks.$id.fail/FailRunTaskService.server";
1615

16+
const API_VERSIONS = {
17+
LAZY_LOADED_CACHED_TASKS: "2023-09-29",
18+
SERIALIZED_TASK_OUTPUT: "2023-11-01",
19+
};
20+
1721
const ParamsSchema = z.object({
1822
runId: z.string(),
1923
id: z.string(),

‎apps/webapp/app/routes/api.v1.runs.$runId.tasks.$id.fail/route.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { FailTaskBodyInputSchema } from "@trigger.dev/core";
3+
import { FailTaskBodyInputSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v1.runs.$runId.tasks/route.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { API_VERSIONS, RunTaskBodyOutputSchema } from "@trigger.dev/core";
3+
import { RunTaskBodyOutputSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";
@@ -9,6 +9,11 @@ import { ChangeRequestLazyLoadedCachedTasks } from "./ChangeRequestLazyLoadedCac
99
import { startActiveSpan } from "~/v3/tracer.server";
1010
import { parseRequestJsonAsync } from "~/utils/parseRequestJson.server";
1111

12+
const API_VERSIONS = {
13+
LAZY_LOADED_CACHED_TASKS: "2023-09-29",
14+
SERIALIZED_TASK_OUTPUT: "2023-11-01",
15+
};
16+
1217
const ParamsSchema = z.object({
1318
runId: z.string(),
1419
});

‎apps/webapp/app/routes/api.v1.waitpoints.tokens.$waitpointFriendlyId.complete.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
conditionallyExportPacket,
66
stringifyIO,
77
} from "@trigger.dev/core/v3";
8-
import { WaitpointId } from "@trigger.dev/core/v3/apps";
8+
import { WaitpointId } from "@trigger.dev/core/v3/isomorphic";
99
import { z } from "zod";
1010
import { $replica } from "~/db.server";
1111
import { env } from "~/env.server";

‎apps/webapp/app/routes/api.v1.waitpoints.tokens.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CreateWaitpointTokenRequestBody,
44
CreateWaitpointTokenResponseBody,
55
} from "@trigger.dev/core/v3";
6-
import { WaitpointId } from "@trigger.dev/core/v3/apps";
6+
import { WaitpointId } from "@trigger.dev/core/v3/isomorphic";
77
import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
88
import { parseDelay } from "~/utils/delays";
99
import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";

‎apps/webapp/app/routes/api.v1.webhooks.$key.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { UpdateWebhookBodySchema } from "@trigger.dev/core";
3+
import { UpdateWebhookBodySchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v2.$endpointSlug.sources.$id.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ActionFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { UpdateTriggerSourceBodyV2Schema } from "@trigger.dev/core";
3+
import { UpdateTriggerSourceBodyV2Schema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { authenticateApiRequest } from "~/services/apiAuth.server";
66
import { logger } from "~/services/logger.server";

‎apps/webapp/app/routes/api.v2.$endpointSlug.triggers.$id.registrations.$key.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
REGISTER_SOURCE_EVENT_V2,
55
RegisterSourceEventV2,
66
RegisterTriggerBodySchemaV2,
7-
} from "@trigger.dev/core";
7+
} from "@trigger.dev/core/schemas";
88
import { z } from "zod";
99
import { authenticateApiRequest } from "~/services/apiAuth.server";
1010
import { IngestSendEvent } from "~/services/events/ingestSendEvent.server";

‎apps/webapp/app/routes/api.v2.events.$eventId.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { GetEvent } from "@trigger.dev/core";
3+
import { GetEvent } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { $replica } from "~/db.server";
66
import { authenticateApiRequest } from "~/services/apiAuth.server";

‎apps/webapp/app/routes/api.v2.runs.$runId.statuses.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
22
import { json } from "@remix-run/server-runtime";
3-
import { JobRunStatusRecordSchema } from "@trigger.dev/core";
3+
import { JobRunStatusRecordSchema } from "@trigger.dev/core/schemas";
44
import { z } from "zod";
55
import { prisma } from "~/db.server";
66
import { authenticateApiRequest } from "~/services/apiAuth.server";

‎apps/webapp/app/routes/engine.v1.dev.dequeue.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { json } from "@remix-run/server-runtime";
22
import { DequeuedMessage, DevDequeueRequestBody, MachineResources } from "@trigger.dev/core/v3";
3-
import { BackgroundWorkerId } from "@trigger.dev/core/v3/apps";
3+
import { BackgroundWorkerId } from "@trigger.dev/core/v3/isomorphic";
44
import { env } from "~/env.server";
55
import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
66
import { engine } from "~/v3/runEngine.server";

‎apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.logs.debug.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { TypedResponse } from "@remix-run/server-runtime";
2-
import { assertExhaustive } from "@trigger.dev/core";
3-
import { RunId } from "@trigger.dev/core/v3/apps";
2+
import { assertExhaustive } from "@trigger.dev/core/utils";
3+
import { RunId } from "@trigger.dev/core/v3/isomorphic";
44
import {
55
WorkerApiDebugLogBody,
66
WorkerApiRunAttemptStartResponseBody,

0 commit comments

Comments
 (0)