Fix job progress polling on client

Author: PrinsINT

client/src/stores/corpora.ts

@@ -53,6 +53,8 @@ const useCorpora = defineStore("corpora", () => {
         API.patchCorpus(metadata.uuid, metadata).finally(reload)
     }
 
+    reload()
+
     return {
         corpora,
         loading,

client/src/stores/documents.ts

@@ -18,9 +18,8 @@ const documents = defineStore("documents", () => {
     const { reload: reloadCorpora } = stores.useCorpora()
 
     // Fields
-    const loading = ref<boolean>(false)
+    const loading = ref<boolean>()
     const documents = ref<DocumentMetadata[]>([])
-    const numSourceAnnotations = computed(() => documents.value.filter((i) => i.summary?.annotations.token > 0).length)
     const uploading: Record<string, FileStatus> = reactive({})
     const uploadBusyCount = computed(() => Object.values(uploading).filter((i) => i.status === "busy").length)
     const uploadErrorCount = computed(() => Object.values(uploading).filter((i) => i.status === "error").length)
@@ -106,6 +105,8 @@ const documents = defineStore("documents", () => {
             })
     }
 
+    reload()
+
     // Exports
     return {
         // Fields
@@ -116,7 +117,6 @@ const documents = defineStore("documents", () => {
         uploading,
         uploadBusyCount,
         uploadErrorCount,
-        numSourceAnnotations,
         // Methods
         reload,
         remove,

client/src/stores/jobs.ts

@@ -10,7 +10,6 @@ const POLL_INTERVAL = 5000
 const useJobs = defineStore("jobs", () => {
     // Stores
     const corporaStore = stores.useCorpora()
-    const documents = stores.useDocuments()
     const { corpusId } = storeToRefs(corporaStore)
 
     // Fields
@@ -24,10 +23,14 @@ const useJobs = defineStore("jobs", () => {
     // Methods
     /** Reload the available jobs for the current corpus. */
     function reload(): void {
-        documents.reload()
         loading.value = true
         API.getJobs(corpusId.value)
-            .then((response) => (jobs.value = response.data))
+            .then((res) => {
+                jobs.value = res.data
+                jobs.value
+                    .filter((j: Job) => j.progress.busy)
+                    .forEach((j: Job) => { startPolling(j.tagger.id, corpusId.value) })
+            })
             .finally(() => (loading.value = false))
     }
     /** Fetch the progress for the given job. To be used within a poller. */
@@ -41,7 +44,7 @@ const useJobs = defineStore("jobs", () => {
         if (response.request.responseURL.includes(corporaStore.corpusId)) {
             // Only commit the response if it corresponds to the correct corpus
             // This prevents late responses overwriting responses to newer requests
-            jobs.value[job].progress = response.data
+            jobs.value.find((j: Job) => j.tagger.id === job).progress = response.data
             // Stop polling if the job is done.
             if (!response.data.busy) {
                 stopPolling(job)
@@ -119,6 +122,8 @@ const useJobs = defineStore("jobs", () => {
             })
     }
 
+    reload()
+
     // Exports
     return {
         // Fields

client/src/stores/jobselection.ts

@@ -1,15 +1,13 @@
 import stores from "@/stores"
-import { type Job, SOURCE_LAYER } from "@/types/jobs"
+import { type Job } from "@/types/jobs"
 import type { SelectOption } from "@/types/ui/select"
 import { useRouteQuery } from "@vueuse/router"
 
 /** Stores the current job selection from the <select>. Used in Evaluation & Export. */
 const useJobSelection = defineStore("jobSelection", () => {
     // Stores
     const { jobs } = storeToRefs(stores.useJobs())
-    const { reload } = stores.useJobs()
-    const corpora = stores.useCorpora()
-    const documentsStore = stores.useDocuments()
+    const { corpusId } = storeToRefs(stores.useCorpora())
 
     // Fields
     const hypothesisId = useRouteQuery<string>("hypothesis")
@@ -20,29 +18,15 @@ const useJobSelection = defineStore("jobSelection", () => {
     const options = computed<SelectOption[]>((): SelectOption[] =>
         jobs.value
             .filter((j: Job) => j.progress.finished > 0)
-            .map((j: Job) => ({ value: j.tagger.id, text: formatJobString(j) })),
-    )
-
-    watch(
-        () => corpora.corpusId,
-        () => {
-            hypothesisId.value = undefined
-            referenceId.value = undefined
-        },
+            .map((j: Job) => ({ value: j.tagger.id, text: format(j) })),
     )
 
     /** Format as displayed in the <select> */
-    function formatJobString(job: Job): string {
-        const total = job.progress.total
-        let finished = job.progress.finished
-        if (job.tagger.id === SOURCE_LAYER) {
-            finished = documentsStore.numSourceAnnotations
-            return `source annotations [${finished}/${total} docs]`
-        }
-        return `${job.tagger.id} (${job.tagger.description}) [${finished}/${total} docs]`
+    function format(job: Job): string {
+        return `${job.tagger.id} (${job.tagger.description}) [${job.progress.finished}/${job.progress.total} docs]`
     }
 
-    reload()
+    watch(corpusId, () => { hypothesisId.value = undefined; referenceId.value = undefined })
 
     return { hypothesisId, referenceId, options }
 })

client/src/views/annotate/subviews/evaluate/subviews/DocumentLayerComparisonView.vue

@@ -14,14 +14,14 @@
         </GForm>
 
         <div v-if="selectedDoc && selectedAnnotation" class="document">
-            <template v-for="tc in termcomps.slice(firstRecord, firstRecord + rowsToDisplay)" :key="tc.refTerm.id">
+            <template v-for="tc in termcomps.slice(firstRecord, firstRecord + rowsToDisplay)" :key="tc.ref.id">
                 <span class="wordComparison" :class="{ incorrect: !annotationsEqual(tc) }">
-                    {{ tc.refTerm.annotations["token"] }}
-                    <SingleTermComparisonTable :hypoTerm="tc.hypoTerm" :refTerm="tc.refTerm" class="tooltip" />
+                    {{ tc.ref.annotations["token"] }}
+                    <SingleTermComparisonTable :hypoTerm="tc.hyp" :refTerm="tc.ref" class="tooltip" />
                 </span>
 
                 <!-- add newline after . -->
-                <br v-if="tc.refTerm.annotations['token'] == '.'" />
+                <br v-if="tc.ref.annotations['token'] == '.'" />
             </template>
 
             <Paginator
@@ -92,8 +92,8 @@ watch(termcomps, () => {
 
 // Methods
 function annotationsEqual(tc: TermComparison) {
-    const refAnnot = cleanAnnotation(tc.refTerm)
-    const hypoAnnot = cleanAnnotation(tc.hypoTerm)
+    const refAnnot = cleanAnnotation(tc.ref)
+    const hypoAnnot = cleanAnnotation(tc.hyp)
     return refAnnot === hypoAnnot
 }