From 55da7c773b99e9cf414dcb6bb768e7aaa5936d2a Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Wed, 8 Jan 2025 20:04:05 +0000 Subject: [PATCH] Make the authenticated env optional when updating run metadata --- .../app/routes/api.v1.runs.$runId.metadata.ts | 2 +- .../services/metadata/updateMetadata.server.ts | 16 ++++++++++------ .../app/v3/services/finalizeTaskRun.server.ts | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/webapp/app/routes/api.v1.runs.$runId.metadata.ts b/apps/webapp/app/routes/api.v1.runs.$runId.metadata.ts index 1ebf43bc3..ce9222a18 100644 --- a/apps/webapp/app/routes/api.v1.runs.$runId.metadata.ts +++ b/apps/webapp/app/routes/api.v1.runs.$runId.metadata.ts @@ -16,7 +16,7 @@ const { action } = createActionApiRoute( method: "PUT", }, async ({ authentication, body, params }) => { - const result = await updateMetadataService.call(authentication.environment, params.runId, body); + const result = await updateMetadataService.call(params.runId, body, authentication.environment); if (!result) { return json({ error: "Task Run not found" }, { status: 404 }); diff --git a/apps/webapp/app/services/metadata/updateMetadata.server.ts b/apps/webapp/app/services/metadata/updateMetadata.server.ts index 6f1cb82ad..47a9a8f5c 100644 --- a/apps/webapp/app/services/metadata/updateMetadata.server.ts +++ b/apps/webapp/app/services/metadata/updateMetadata.server.ts @@ -229,17 +229,21 @@ export class UpdateMetadataService extends BaseService { } public async call( - environment: AuthenticatedEnvironment, runId: string, - body: UpdateMetadataRequestBody + body: UpdateMetadataRequestBody, + environment?: AuthenticatedEnvironment ) { const runIdType = runId.startsWith("run_") ? "friendly" : "internal"; const taskRun = await this._prisma.taskRun.findFirst({ - where: { - runtimeEnvironmentId: environment.id, - ...(runIdType === "internal" ? { id: runId } : { friendlyId: runId }), - }, + where: environment + ? { + runtimeEnvironmentId: environment.id, + ...(runIdType === "internal" ? { id: runId } : { friendlyId: runId }), + } + : { + ...(runIdType === "internal" ? { id: runId } : { friendlyId: runId }), + }, select: { id: true, status: true, diff --git a/apps/webapp/app/v3/services/finalizeTaskRun.server.ts b/apps/webapp/app/v3/services/finalizeTaskRun.server.ts index c31486021..3c87dd5f4 100644 --- a/apps/webapp/app/v3/services/finalizeTaskRun.server.ts +++ b/apps/webapp/app/v3/services/finalizeTaskRun.server.ts @@ -70,9 +70,9 @@ export class FinalizeTaskRunService extends BaseService { completedAt, }); - if (env && metadata) { + if (metadata) { try { - await updateMetadataService.call(env, id, metadata); + await updateMetadataService.call(id, metadata, env); } catch (e) { logger.error("[FinalizeTaskRunService] Failed to update metadata", { taskRun: id,