Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
519 changes: 519 additions & 0 deletions apps/api/src/__snapshots__/openapi-snapshot.test.ts.snap

Large diffs are not rendered by default.

120 changes: 120 additions & 0 deletions apps/api/src/experiment-coordinator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,126 @@ describe("ExperimentCoordinator", () => {
);
});

it("soft-deletes an uncommitted report when lifecycle deletion wins the CAS", async () => {
const initial = experiment([], {
handlerSummary: {
"pp-readout": {
status: "done",
version: 1,
updatedAt: now,
},
},
reportTemplates: {},
report: {
reportId: "readout-1",
url: "/api/v1/reports/readout-1",
updatedAt: now,
},
});
initial.revision.reportTemplateIds = [];
const deleting = structuredClone(initial);
deleting.lifecycle = {
operationId: "operation-1",
phase: "deleting",
stateVersion: 1,
targets: {
storage: "inline",
entryCount: 0,
payloadFingerprint: fingerprintExperimentPayload([]),
payloadVersion: 1,
entries: [],
},
targetFingerprint: fingerprintExperimentPayload([]),
progress: {
expectedRequests: 0,
completedRequests: 0,
expectedReports: 0,
completedReports: 0,
},
blocking: [],
deleteRequestedAt: now,
};
const template = {
_id: "always",
projectId: "project-1",
id: "always",
subject: "experiment",
name: "Always",
userPrompt: "Summarize",
trigger: { type: "always" as const },
enabled: true,
currentVersionId: "always:v1",
currentVersion: 1,
contentFingerprint: "always-fingerprint",
createdAt: now,
};
const updateMany = vi.fn().mockResolvedValue({ modifiedCount: 1 });
vi.spyOn(
ExperimentStore.prototype,
"updateReportTemplateSummaries",
).mockResolvedValue(null);
vi.spyOn(
ExperimentStore.prototype,
"getIncludingDeleted",
).mockResolvedValue(deleting);
const coordinator = new ExperimentCoordinator(
{
requests: {} as Collection<RequestDocument>,
experiments: {} as Collection<ExperimentDocument>,
executions: {} as Collection<ExperimentExecutionHistoryDocument>,
chunks: {} as Collection,
services: {
find: vi.fn().mockReturnValue(cursor([{
_id: "pp-readout",
type: "experiment-handler",
version: 1,
queue: "queue-readout",
selector: "readout",
autoBackfill: false,
dependsOn: [],
dependencyMode: "all-runs",
}])),
} as unknown as Collection<ServiceHandlerDocument>,
reportTemplates: {
find: vi.fn().mockReturnValue(cursor([template])),
} as unknown as Collection,
reportTemplateVersions: {} as Collection,
reports: {
insertOne: vi.fn().mockResolvedValue({ acknowledged: true }),
findOne: vi.fn(),
updateMany,
} as unknown as Collection,
},
vi.fn(),
);

const dispatched = await (
coordinator as unknown as {
dispatchReadyReportTemplates(
experiment: ExperimentDocument,
requests: readonly ExperimentRequestState[],
requestById: ReadonlyMap<string, RequestDocument>,
): Promise<boolean>;
}
).dispatchReadyReportTemplates(initial, [], new Map());

expect(dispatched).toBe(false);
expect(updateMany).toHaveBeenCalledWith(
expect.objectContaining({
projectId: "project-1",
experimentId: "experiment-1",
experimentExecutionId: "execution-1",
status: "pending",
deletedAt: { $exists: false },
}),
{
$set: {
deletedAt: expect.any(Date),
},
},
);
});

it("projects authoritative run status and dispatches an exact execution message", async () => {
const initialRequest: ExperimentRequestState = {
requestId: "request-1",
Expand Down
35 changes: 34 additions & 1 deletion apps/api/src/experiment-coordinator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,40 @@ export class ExperimentCoordinator {
summaries,
now,
});
if (!updated) return false;
if (!updated) {
const current = await this.store.getIncludingDeleted(
experiment.projectId,
experiment.experimentId,
);
if (
current?.lifecycle?.phase === "deleting" ||
current?.lifecycle?.phase === "deleted" ||
current?.lifecycle?.phase === "restoring"
) {
await this.collections.reports.updateMany(
{
_id: {
$in: [...newlyQueued].flatMap((templateId) => {
const reportId = summaries[templateId]?.report?.reportId;
return reportId ? [reportId] : [];
}),
},
projectId: experiment.projectId,
experimentId: experiment.experimentId,
experimentExecutionId:
experiment.execution.experimentExecutionId,
status: "pending",
deletedAt: { $exists: false },
} as Document,
{
$set: {
deletedAt: new Date(),
},
} as Document,
);
}
return false;
}
experiment = updated;
}

Expand Down
22 changes: 21 additions & 1 deletion apps/api/src/experiment-dispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ import {
type ExperimentDispatchMessage,
type ExperimentTemplateDispatchMessage,
} from "./experiment-coordinator.js";
import { ExperimentLifecycleCoordinator } from "./experiment-lifecycle.js";

export class ExperimentDispatcher {
private interval: ReturnType<typeof setInterval> | null = null;
private dispatching = false;
private scanAfterExperimentId: string | null = null;
private readonly queueClients = new Map<string, QueueClient>();
private readonly coordinator: ExperimentCoordinator;
private readonly lifecycle: ExperimentLifecycleCoordinator;

constructor(
private readonly requests: Collection<RequestDocument>,
Expand All @@ -47,6 +49,13 @@ export class ExperimentDispatcher {
},
(service, message) => this.enqueue(service, message),
);
this.lifecycle = new ExperimentLifecycleCoordinator({
requests,
reports: db.collection("reports"),
experiments,
executions,
chunks,
});
}

start(): void {
Expand Down Expand Up @@ -127,14 +136,25 @@ export class ExperimentDispatcher {
try {
await this.coordinator.recoverInterruptedCreations(this.batchSize);
await this.coordinator.recoverInterruptedMemberships(this.batchSize);
await this.lifecycle.repairActive(this.batchSize);
const candidates = await this.experiments
.find(
this.scanAfterExperimentId
? {
_id: { $gt: this.scanAfterExperimentId },
finalizedAt: { $exists: true },
deletedAt: { $exists: false },
"lifecycle.phase": {
$nin: ["deleting", "deleted", "restoring"],
},
}
: { finalizedAt: { $exists: true } },
: {
finalizedAt: { $exists: true },
deletedAt: { $exists: false },
"lifecycle.phase": {
$nin: ["deleting", "deleted", "restoring"],
},
},
)
.sort({ _id: 1 })
.limit(this.batchSize)
Expand Down
Loading
Loading