@openneuro/server 4.38.0-alpha.4 → 4.38.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.38.0-alpha.4",
+  "version": "4.38.1",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^4.5.0",
-    "@openneuro/search": "^4.38.0-alpha.4",
+    "@openneuro/search": "^4.38.1",
     "@sentry/node": "^8.25.0",
     "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e250dd042cc229e0355dcb80fcd439d27b3e6db8"
+  "gitHead": "6d5949cde219e5019ec2043ca4e5ebdde6083fae"
 }

package/src/graphql/permissions.ts

@@ -169,3 +169,12 @@ export const checkAdmin = (userId, userInfo) =>
   userId && userInfo.admin
     ? Promise.resolve(true)
     : Promise.reject(states.ADMIN.errorMessage)
+
+/**
+ * Check if the user is a worker
+ * @param userInfo User context
+ */
+export const checkWorker = (userInfo) => {
+  if (userInfo?.worker) return true
+  else throw new Error("You must be a worker to make this request.")
+}

package/src/graphql/resolvers/mutation.ts

@@ -46,6 +46,7 @@ import {
 import { saveAdminNote } from "./datasetEvents"
 import { createGitEvent } from "./gitEvents"
 import { updateFileCheck } from "./fileCheck"
+import { updateWorkerTask } from "./worker"
 
 const Mutation = {
   createDataset,
@@ -95,6 +96,7 @@ const Mutation = {
   saveAdminNote,
   createGitEvent,
   updateFileCheck,
+  updateWorkerTask,
 }
 
 export default Mutation

package/src/graphql/resolvers/worker.ts

@@ -0,0 +1,23 @@
+import WorkerTask from "../../models/worker-task"
+import { checkWorker } from "../permissions"
+
+/**
+ * Update a worker task record
+ *
+ * This can be called for new tasks, or to update existing tasks.
+ */
+export const updateWorkerTask = async (obj, args, { userInfo }) => {
+  checkWorker(userInfo)
+  const { id, ...updateData } = args
+
+  // Don't allow null values to unset fields
+  const update = Object.fromEntries(
+    Object.entries(updateData).filter(([, value]) => value != null),
+  )
+
+  const task = await WorkerTask.findOneAndUpdate({ id }, { $set: update }, {
+    new: true,
+    upsert: true,
+  }).exec()
+  return task
+}

package/src/graphql/schema.ts

@@ -213,6 +213,19 @@ export const typeDefs = `
       annexFsck: [AnnexFsckInput!]!
       remote: String
     ): FileCheck
+    # Update worker task queue status
+    updateWorkerTask(
+      id: ID!,
+      args: JSON,
+      kwargs: JSON,
+      taskName: String,
+      worker: String,
+      queuedAt: DateTime,
+      startedAt: DateTime,
+      finishedAt: DateTime,
+      error: String,
+      executionTime: Int,
+    ): WorkerTask
   }
 
   # Anonymous dataset reviewer
@@ -941,6 +954,18 @@ export const typeDefs = `
     input: [String]
   }
 
+  type WorkerTask {
+    id: ID!
+    args: JSON
+    kwargs: JSON
+    taskName: String
+    worker: String
+    queuedAt: DateTime
+    startedAt: DateTime
+    finishedAt: DateTime
+    error: String
+    executionTime: Int
+  }
 `
 
 schemaComposer.addTypeDefs(typeDefs)

package/src/models/worker-task.ts

@@ -0,0 +1,38 @@
+import mongoose from "mongoose"
+import type { Document } from "mongoose"
+const { Schema, model } = mongoose
+
+export interface WorkerTaskDocument extends Document {
+  id: string
+  args?: Record<string, unknown>
+  kwargs?: Record<string, unknown>
+  taskName?: string
+  worker?: string
+  queuedAt?: Date
+  startedAt?: Date
+  finishedAt?: Date
+  error?: string
+  executionTime?: number
+}
+
+const workerTaskSchema = new Schema({
+  id: { type: String, required: true, unique: true },
+  args: { type: Object },
+  kwargs: { type: Object },
+  taskName: { type: String },
+  worker: { type: String },
+  queuedAt: { type: Date },
+  startedAt: { type: Date },
+  finishedAt: { type: Date },
+  error: { type: String },
+  executionTime: { type: Number },
+})
+
+workerTaskSchema.index({ id: 1 })
+
+const WorkerTaskModel = model<WorkerTaskDocument>(
+  "WorkerTask",
+  workerTaskSchema,
+)
+
+export default WorkerTaskModel