Partial fix of evaluate job select

Author: PrinsINT

client/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:24.0.2-alpine3.21 AS build
 COPY . .
-RUN npm ci && npm run build-only
+RUN npm ci && npm run build
 
 FROM nginx:1.28.0-alpine3.21-slim
 COPY --from=build /dist /usr/share/nginx/html

client/package-lock.json

@@ -23,6 +23,7 @@
         "@biomejs/biome": "^1.9.4",
         "@rollup/plugin-yaml": "^4.1.2",
         "@tsconfig/node24": "^24.0.1",
+        "@types/content-disposition": "^0.5.8",
         "@types/node": "^22.15.21",
         "@vitejs/plugin-vue": "^5.2.4",
         "@vue/tsconfig": "^0.7.0",

client/package.json

@@ -9,19 +9,19 @@
         </template>
     </GTabs>
 
-    <GModal :show="appStore.errors.length > 0" title="Ocharme!" @hide="appStore.resetErrors">
+    <GModal :show="errorsStore.errors.length > 0" title="Ocharme!" @hide="errorsStore.resetErrors">
         <p>
             Please try again or contact
             <MailAddress /> for support.
         </p>
-        <GInfo v-for="(error, i) in appStore.errors" :key="i" error>{{ error }}</GInfo>
+        <GInfo v-for="(error, i) in errorsStore.errors" :key="i" error>{{ error }}</GInfo>
     </GModal>
 </template>
 
 <script setup lang="ts">
 import stores from "@/stores"
 
-const appStore = stores.useApp()
+const errorsStore = stores.useErrors()
 const userStore = stores.useUser()
 
 onMounted(() => {

client/src/App.vue

@@ -2,18 +2,13 @@
  * API for fetching benchmarks.
  */
 
+import axios, { type AxiosResponse } from "axios"
 import type { Benchmarks } from "@/types/assays"
-// --- libraries ---
-import axios from "axios"
-// --- types ---
-import type { AxiosResponse } from "axios"
 
 type BenchmarksResponse = AxiosResponse<Benchmarks>
 
-// --- data ---
 const benchmarksPath = "/benchmarks"
 
-// --- methods ---
 /**
  * Fetch all benchmarks.
  */

client/src/api/benchmarks.ts

@@ -2,27 +2,19 @@
  * API calls for creating, updating, deleting a corpus, and fetching the list of corpora.
  */
 
+import axios, { type AxiosResponse } from "axios"
 import type {
     CorpusMetadata,
     MutableCorpusMetadata,
     UUID,
 } from "@/types/corpora"
-// --- libraries ---
-import axios from "axios"
-// --- types ---
-import type { AxiosResponse } from "axios"
 
 type CorporaResponse = AxiosResponse<CorpusMetadata[]>
 type CorpusResponse = AxiosResponse<CorpusMetadata>
 
-// --- data ---
 const corporaPath = "/corpora"
-const datasetCorporaPath = "/datasets_corpora"
+const corpusPath = (uuid: UUID): string => `${corporaPath}/${uuid}`
 
-// --- computed ---
-const corpusPath = (uuid: UUID) => `${corporaPath}/${uuid}`
-
-// --- methods ---
 /**
  * Fetch all corpora for which the user has read access:
  * public (datasets), shared (collaborator/viewer), and owned.
@@ -39,13 +31,6 @@ export function getCorpus(uuid: UUID): Promise<CorpusResponse> {
     return axios.get(corpusPath(uuid))
 }
 
-/**
- * Fetch all datasets. Note that all datasets are public. Cheaper than getCorpora().
- */
-export function getDatasetCorpora(): Promise<CorporaResponse> {
-    return axios.get(datasetCorporaPath)
-}
-
 /**
  * Create a new corpus with the given metadata.
  * @param corpus Metadata of new corpus.
@@ -60,7 +45,7 @@ export function postCorpus(
  * Delete a corpus by UUID.
  * @param uuid UUID of corpus to delete.
  */
-export function deleteCorpus(uuid: UUID) {
+export function deleteCorpus(uuid: UUID): Promise<AxiosResponse> {
     return axios.delete(corpusPath(uuid))
 }
 
@@ -69,6 +54,9 @@ export function deleteCorpus(uuid: UUID) {
  * @param uuid UUID of corpus to update.
  * @param metadata New metadata.
  */
-export function patchCorpus(uuid: UUID, metadata: MutableCorpusMetadata) {
+export function patchCorpus(
+    uuid: UUID,
+    metadata: MutableCorpusMetadata,
+): Promise<AxiosResponse> {
     return axios.patch(corpusPath(uuid), metadata)
 }

client/src/api/corpora.ts

@@ -3,26 +3,19 @@
  * and downloading the uploaded source document.
  */
 
-// -- api ---
-import * as Utils from "@/api/utils"
-import type { BlobResponse } from "@/api/utils"
+import axios, { type AxiosResponse } from "axios"
+import { getBlob, type BlobResponse } from "@/api/utils"
 import type { UUID } from "@/types/corpora"
 import type { DocumentMetadata } from "@/types/documents"
-// --- libraries ---
-import axios from "axios"
-// --- types ---
-import type { AxiosResponse } from "axios"
 
 type DocumentsResponse = AxiosResponse<DocumentMetadata[]>
 
-// --- computed ---
-const documentsPath = (corpus: UUID) => `/corpora/${corpus}/documents`
-const documentPath = (corpus: UUID, document: string) =>
+const documentsPath = (corpus: UUID): string => `/corpora/${corpus}/documents`
+const documentPath = (corpus: UUID, document: string): string =>
     `${documentsPath(corpus)}/${document}`
-const rawDocumentPath = (corpus: UUID, document: string) =>
+const rawDocumentPath = (corpus: UUID, document: string): string =>
     `${documentPath(corpus, document)}/raw`
 
-// --- methods ---
 /**
  * Fetch all documents for a corpus.
  * @param corpus UUID of the corpus.
@@ -41,7 +34,7 @@ export function postDocument(
     corpus: UUID,
     document: FormData,
     contentType?: Record<string, string>,
-) {
+): Promise<AxiosResponse> {
     return axios.post(documentsPath(corpus), document, { headers: contentType })
 }
 
@@ -50,7 +43,10 @@ export function postDocument(
  * @param corpus UUID of the corpus.
  * @param document Document name.
  */
-export function deleteDocument(corpus: UUID, document: string) {
+export function deleteDocument(
+    corpus: UUID,
+    document: string,
+): Promise<AxiosResponse> {
     return axios.delete(documentPath(corpus, document))
 }
 
@@ -63,5 +59,5 @@ export function getRawDocument(
     corpus: UUID,
     document: string,
 ): Promise<BlobResponse> {
-    return Utils.getBlob(rawDocumentPath(corpus, document))
+    return getBlob(rawDocumentPath(corpus, document))
 }

client/src/api/documents.ts

@@ -2,47 +2,40 @@
  * API calls for fetching evaluation metrics and downloading them as a zip report.
  */
 
-// --- api ---
-import * as Utils from "@/api/utils"
-import type { BlobResponse } from "@/api/utils"
+import axios, { type AxiosResponse } from "axios"
+import { getBlob, type BlobResponse } from "@/api/utils"
 import type { UUID } from "@/types/corpora"
 import type {
     ConfusionWrapper,
     DistributionWrapper,
     Metrics,
     TermComparison,
 } from "@/types/evaluation"
-// --- libraries ---
-import axios from "axios"
-// --- types ---
-import type { AxiosResponse } from "axios"
 
 type ConfusionResponse = AxiosResponse<ConfusionWrapper>
 type DistributionResponse = AxiosResponse<DistributionWrapper>
 type MetricsResponse = AxiosResponse<Metrics>
 
-// --- computed ---
-const evaluationPath = (corpus: UUID, hypothesis: string) =>
+const evaluationPath = (corpus: UUID, hypothesis: string): string =>
     `/corpora/${corpus}/jobs/${hypothesis}/evaluation`
-const confusionPath = (corpus: UUID, hypothesis: string) =>
+const confusionPath = (corpus: UUID, hypothesis: string): string =>
     `${evaluationPath(corpus, hypothesis)}/confusion`
-const confusionSamplesPath = (corpus: UUID, hypo: string) =>
-    `${evaluationPath(corpus, hypo)}/confusion/download`
-const distributionPath = (corpus: UUID, hypothesis: string) =>
+const confusionSamplesPath = (corpus: UUID, hypo: string): string =>
+    `${confusionPath(corpus, hypo)}/download`
+const distributionPath = (corpus: UUID, hypothesis: string): string =>
     `${evaluationPath(corpus, hypothesis)}/distribution`
-const metricsPath = (corpus: UUID, hypothesis: string) =>
+const metricsPath = (corpus: UUID, hypothesis: string): string =>
     `${evaluationPath(corpus, hypothesis)}/metrics`
-const metricsSamplesPath = (corpus: UUID, hypo: string) =>
-    `${evaluationPath(corpus, hypo)}/metrics/download`
-const downloadPath = (corpus: UUID, hypothesis: string) =>
+const metricsSamplesPath = (corpus: UUID, hypo: string): string =>
+    `${metricsPath(corpus, hypo)}/download`
+const downloadPath = (corpus: UUID, hypothesis: string): string =>
     `${evaluationPath(corpus, hypothesis)}/download`
 const documentLayerComparisonPath = (
     corpus: UUID,
     job: string,
     document: string,
-) => `/corpora/${corpus}/jobs/${job}/documents/${document}/evaluation`
+): string => `/corpora/${corpus}/jobs/${job}/documents/${document}/evaluation`
 
-// --- methods ---
 /**
  * Fetch term frequency distribution.
  * @param corpus UUID of the corpus.
@@ -96,7 +89,7 @@ export function getDownloadEvaluation(
     hypothesis: string,
     reference: string,
 ): Promise<BlobResponse> {
-    return Utils.getBlob(downloadPath(corpus, hypothesis), {
+    return getBlob(downloadPath(corpus, hypothesis), {
         params: { reference },
     })
 }
@@ -117,7 +110,7 @@ export function getConfusionSamples(
     refFilter: string,
     annotationType: string,
 ): Promise<BlobResponse> {
-    return Utils.getBlob(confusionSamplesPath(corpus, hypothesis), {
+    return getBlob(confusionSamplesPath(corpus, hypothesis), {
         params: { reference, hypoFilter, refFilter, annotationType },
     })
 }
@@ -147,7 +140,7 @@ export function getMetricsSamples(
     if (group) {
         params.group = group
     }
-    return Utils.getBlob(metricsSamplesPath(corpus, hypothesis), { params })
+    return getBlob(metricsSamplesPath(corpus, hypothesis), { params })
 }
 
 /**

client/src/api/evaluation.ts

@@ -3,30 +3,25 @@
  * Either converted to a certain format or merged with their original file if the format supports it.
  */
 
-// --- api ---
-import * as Utils from "@/api/utils"
-// --- types ---
-import type { BlobResponse } from "@/api/utils"
+import { getBlob, type BlobResponse } from "@/api/utils"
 import type { UUID } from "@/types/corpora"
 import type { Format } from "@/types/documents"
 
-// --- computed ---
 const convertCorpusPath = (
     corpus: UUID,
     job: string,
     format: Format,
     posHeadOnly: boolean,
-) =>
+): string =>
     `/corpora/${corpus}/jobs/${job}/export/convert?format=${format}&posHeadOnly=${posHeadOnly}`
 const mergeCorpusPath = (
     corpus: UUID,
     job: string,
     format: Format,
     posHeadOnly: boolean,
-) =>
+): string =>
     `/corpora/${corpus}/jobs/${job}/export/merge?format=${format}&posHeadOnly=${posHeadOnly}`
 
-// --- methods ---
 /**
  * Download a corpus converted to the desired format.
  * @param corpus UUID of the corpus.
@@ -40,7 +35,7 @@ export function convertCorpus(
     format: Format,
     posHeadOnly: boolean,
 ): Promise<BlobResponse> {
-    return Utils.getBlob(convertCorpusPath(corpus, job, format, posHeadOnly))
+    return getBlob(convertCorpusPath(corpus, job, format, posHeadOnly))
 }
 
 /**
@@ -56,5 +51,5 @@ export function mergeCorpus(
     format: Format,
     posHeadOnly: boolean,
 ): Promise<BlobResponse> {
-    return Utils.getBlob(mergeCorpusPath(corpus, job, format, posHeadOnly))
+    return getBlob(mergeCorpusPath(corpus, job, format, posHeadOnly))
 }

client/src/api/export.ts

@@ -2,21 +2,18 @@
  * Axios config.
  */
 
-// --- libraries ---
 import axios from "axios"
 
-// --- types ---
 export type ErrorMessage = {
     statusCode: string
     message: string
 }
 
-// --- methods ---
 /**
  * Set the axios request base to localhost:8010 if running locally,
  * or https://<hostname>/galahad/api/ if running in production.
  */
-export const setAxiosBaseUrl = () => {
+export function setAxiosBaseUrl(): void {
     axios.defaults.baseURL =
         location.hostname === "localhost"
             ? `${location.protocol}//localhost:8010`