feat: support for nextflow 24

package.json

@@ -38,12 +38,12 @@
 		"eslint-config-next": "13.4.19",
 		"moment": "^2.29.4",
 		"nanoid": "^4.0.2",
-		"next": "13.5.2",
+		"next": "^14.2.3",
 		"next-logger": "^3.0.2",
 		"plotly.js": "^2.26.0",
 		"postcss": "8.4.27",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
 		"react-hot-toast": "^2.4.1",
 		"react-icons": "^4.10.1",
 		"react-infinite-scroll-component": "^6.1.0",

prisma/migrations/20240709192350_sample/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workflow" ALTER COLUMN "stats" DROP NOT NULL;

prisma/migrations/20240709192801_container_opt/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workflow" ALTER COLUMN "container" DROP NOT NULL;

prisma/schema.prisma

@@ -21,7 +21,7 @@ model Workflow {
   profile         String
   homeDir         String
   workDir         String
-  container       String
+  container       String?
   commitId        String?
   errorMessage    String?
   repository      String?
@@ -40,7 +40,7 @@ model Workflow {
   /// [Nextflow]
   nextflow        Json
   /// [Stats]
-  stats           Json
+  stats           Json?
   resume          Boolean
   success         Boolean
   projectName     String

src/app/api/trace/[id]/begin/route.ts

@@ -36,7 +36,7 @@ export async function PUT(request: NextRequest, { params }: any) {
 				profile: requestJson.workflow.profile,
 				homeDir: requestJson.workflow.homeDir,
 				workDir: requestJson.workflow.workDir,
-				container: requestJson.workflow.container,
+				container: requestJson.workflow.container ?? "",
 				commitId: requestJson.workflow.commitId,
 				errorMessage: requestJson.workflow.errorMessage,
 				repository: requestJson.workflow.repository,
@@ -53,7 +53,7 @@ export async function PUT(request: NextRequest, { params }: any) {
 				commandLine: requestJson.workflow.commandLine,
 				stubRun: requestJson.workflow.stubRun,
 				nextflow: requestJson.workflow.nextflow,
-				stats: requestJson.workflow.workflowStats,
+				// stats: requestJson.workflow.workflowStats,
 				resume: requestJson.workflow.resume,
 				success: requestJson.workflow.success,
 				projectName: requestJson.workflow.projectName,
@@ -73,21 +73,20 @@ export async function PUT(request: NextRequest, { params }: any) {
 				progress: {
 					create: {
 						id: id,
-						pending: requestJson.workflow.workflowStats.pendingCount,
-						ignored: requestJson.workflow.workflowStats.ignoredCount,
-						loadCpus: requestJson.workflow.workflowStats.loadCpus,
-						loadMemory: requestJson.workflow.workflowStats.loadMemory,
-						processes: requestJson.workflow.workflowStats.processes,
-						aborted: requestJson.workflow.workflowStats.abortedCount,
-						succeeded: requestJson.workflow.workflowStats.succeededCount,
-						peakMemory: requestJson.workflow.workflowStats.peakMemory,
-						peakCpus: requestJson.workflow.workflowStats.peakCpus,
-						failed: requestJson.workflow.workflowStats.failedCount,
-						running: requestJson.workflow.workflowStats.runningCount,
-						retries: requestJson.workflow.workflowStats.retriesCount,
-						peakRunning: requestJson.workflow.workflowStats.peakRunning,
-						cached: requestJson.workflow.workflowStats.cachedCount,
-						submitted: requestJson.workflow.workflowStats.submittedCount,
+						pending: 0,
+						ignored: 0,
+						loadCpus: 0,
+						loadMemory: 0,
+						aborted: 0,
+						succeeded: 0,
+						peakMemory: 0,
+						peakCpus: 0,
+						failed: 0,
+						running: 0,
+						retries: 0,
+						peakRunning: 0,
+						cached: 0,
+						submitted: 0,
 					},
 				},
 			},
@@ -100,6 +99,7 @@ export async function PUT(request: NextRequest, { params }: any) {
 			watchUrl: `${baseUrl}/runs/${id}`,
 		})
 	} catch (e: any) {
+		console.error(e)
 		return NextResponse.json({ error: e }, { status: 500 })
 	}
 }

src/app/api/trace/[id]/complete/route.ts

@@ -52,26 +52,31 @@ export async function PUT(request: Request, { params }: any) {
 			},
 		})
 
-		const settings = await GetSettings()
-		if (
-			settings.slack_notifications_enabled &&
-			settings.slack_webhook_url &&
-			settings.slack_notification_events.includes("run_completed")
-		) {
-			const tags = requestJson.workflow?.params["tags"]?.split(",").map((e: string) => e.trim()) ?? []
-			const duration = formatDuration(requestJson.workflow.duration / 1000)
-			const slackWebhookOpts: RunCompletedOptions = {
-				id: id,
-				baseUrl: settings.base_url ?? "",
-				name: requestJson.workflow.manifest.description,
-				runName: requestJson.workflow.runName,
-				duration: duration,
-				tags: tags,
-				status: requestJson.workflow.success,
+		try {
+			const settings = await GetSettings()
+			if (
+				settings.slack_notifications_enabled &&
+				settings.slack_webhook_url &&
+				settings.slack_notification_events.includes("run_completed")
+			) {
+				const tags = requestJson.workflow?.params["tags"]?.split(",").map((e: string) => e.trim()) ?? []
+				const duration = formatDuration(requestJson.workflow.duration / 1000)
+				const slackWebhookOpts: RunCompletedOptions = {
+					id: id,
+					baseUrl: settings.base_url ?? "",
+					name: requestJson.workflow.manifest.description,
+					runName: requestJson.workflow.runName,
+					duration: duration,
+					tags: tags,
+					status: requestJson.workflow.success,
+				}
+				RunCompletedWebhook(settings.slack_webhook_url, slackWebhookOpts)
 			}
-			RunCompletedWebhook(settings.slack_webhook_url, slackWebhookOpts)
+		} catch (error) {
+			console.error("Error sending slack notification", error)
 		}
 	} catch (e: any) {
+		console.error(e)
 		return NextResponse.json({ error: e }, { status: 500 })
 	}
 

src/app/runs/[id]/components/Main/Main.tsx

@@ -151,7 +151,11 @@ export const MainRun = (props: PageProps) => {
 			<div className="md:grid md:grid-cols-2 md:gap-4 pt-8 grid-cols-1">
 				<div>{progress && <Processes processes={progress.processes} />}</div>
 				<div>
-					<Utilisation tasks={tasks} peakCpus={workflow.stats.peakCpus} loadCpus={workflow.stats.loadCpus} />
+					<Utilisation
+						tasks={tasks}
+						peakCpus={workflow?.stats?.peakCpus ?? 0}
+						loadCpus={workflow?.stats?.loadCpus ?? 0}
+					/>
 				</div>
 			</div>
 

src/services/prisma/prisma.ts

@@ -1,13 +1,13 @@
 import { PrismaClient } from "@prisma/client"
 
 const prismaClientSingleton = () => {
-  return new PrismaClient()
+	return new PrismaClient()
 }
 
 type PrismaClientSingleton = ReturnType<typeof prismaClientSingleton>
 
 const globalForPrisma = globalThis as unknown as {
-  prisma: PrismaClientSingleton | undefined
+	prisma: PrismaClientSingleton | undefined
 }
 
 export const prisma = globalForPrisma.prisma ?? prismaClientSingleton()