GET Number of active jobs

Author: Vincent Prins

client/src/components/modals/jobs/JobModal.vue

@@ -30,8 +30,8 @@
             <template v-else>
                 <p class="centerText" v-if="job.progress.untagged > 0">
                     <template v-if="jobIndication != null">
-                        GaLAHaD is currently processing <b>{{ jobIndication }}</b> {{ jobIndication == 1 ? 'document' :
-                            'documents' }}
+                        GaLAHaD is currently processing <b>{{ jobIndication }}</b> {{ jobIndication == 1 ? 'job' :
+                            'jobs' }}
                     </template>
                     <template v-else>
                         Calculating current server load...

server/src/main/kotlin/org/ivdnt/galahad/jobs/JobController.kt

@@ -24,6 +24,7 @@ import kotlin.io.path.createTempFile
 object JobController {
     private val queue: ArrayDeque<Job> = ArrayDeque<Job>()
     private var task: Task? = null
+    val queueSize: Int get() = queue.size
 
     fun queue(job: Job) {
         if (job.name == SOURCE_LAYER_NAME) throw SourceLayerNotATaggerException()
@@ -48,6 +49,7 @@ object JobController {
             queue -= task!!.job
         }
         // next document, or next job if all documents are tagged
+        task = null
         start()
     }
 

server/src/main/kotlin/org/ivdnt/galahad/web/controller/JobsController.kt

@@ -11,8 +11,10 @@ import jakarta.servlet.http.HttpServletResponse
 import org.ivdnt.galahad.annotations.Layer
 import org.ivdnt.galahad.app.JOBS_URL
 import org.ivdnt.galahad.app.JOB_URL
+import org.ivdnt.galahad.app.TAGGERS_URL
 import org.ivdnt.galahad.app.User
 import org.ivdnt.galahad.exceptions.ErrorResponse
+import org.ivdnt.galahad.jobs.JobController
 import org.ivdnt.galahad.jobs.JobMetadata
 import org.ivdnt.galahad.jobs.Jobs
 import org.ivdnt.galahad.jobs.Progress
@@ -185,4 +187,12 @@ class JobsController(
         @PathVariable @Parameter(description = "Corpus UUID") corpus: UUID,
         @PathVariable @Parameter(description = "Tagger name") job: String,
     ): Progress = corpus.readJobs().readOrThrow(job).progress
+
+    @Operation(
+        summary = "Number of active tagger jobs",
+        description = "Get the number of active jobs. Indicates server load."
+    )
+    @CrossOrigin
+    @GetMapping("$TAGGERS_URL/active")
+    fun activeJobs(): Int = JobController.queueSize
 }

server/src/main/kotlin/org/ivdnt/galahad/web/controller/TaggersController.kt

@@ -66,12 +66,4 @@ class TaggersController(
     @GetMapping(TAGGER_HEALTH_URL)
     fun getTaggerHealth(@PathVariable @Parameter(description = "Tagger name") tagger: String): TaggerHealth =
         taggersService.taggerHealth(tagger)
-
-    @Operation(
-        summary = "Number of active document jobs",
-        description = "Get the number of documents actively being tagged, cumulative over all taggers. Indicates server load."
-    )
-    @CrossOrigin
-    @GetMapping("$TAGGERS_URL/active")
-    fun getActiveDocsAtTaggers(): Int = taggersService.numActiveDocuments()
 }