Release 1.0.0

Release 1.0.0

.env

@@ -1,5 +1,5 @@
 # Default image version (override using --env-file or -e)
-APP_VERSION=dev
+APP_VERSION=latest
 
 # This is the default network of taggers-dockerized, but you can override it
-taggers_network=taggers-dockerized_taggers-network
+taggers_network=taggers-network

.github/workflows/publish-dev.yml

@@ -1,18 +1,13 @@
-name: Development build and push
+name: Dev images to docker
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches: [ development ]
-
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:     
-
-  build-and-push:
+  dev-images-to-docker:
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -25,19 +20,14 @@ jobs:
           sed "s~{{GITHUB_REPOSITORY}}~$GITHUB_REPOSITORY~g; s/{{VERSION_LABEL}}/dev/g; s/{{GITHUB_REF_TYPE}}/$GITHUB_REF_TYPE/g; s/{{GITHUB_REF_NAME}}/$GITHUB_REF_NAME/g; s/{{GITHUB_SHA}}/$GITHUB_SHA/g; s/{{GITHUB_WORKFLOW}}/$GITHUB_WORKFLOW/g; s/{{GITHUB_RUN_NUMBER}}/$GITHUB_RUN_NUMBER/g; s/{{BUILD_DATE}}/$(date)/g" version.yml.template > server/src/main/resources/version.yml
           sed "s~{{GITHUB_REPOSITORY}}~$GITHUB_REPOSITORY~g; s/{{VERSION_LABEL}}/dev/g; s/{{GITHUB_REF_TYPE}}/$GITHUB_REF_TYPE/g; s/{{GITHUB_REF_NAME}}/$GITHUB_REF_NAME/g; s/{{GITHUB_SHA}}/$GITHUB_SHA/g; s/{{GITHUB_WORKFLOW}}/$GITHUB_WORKFLOW/g; s/{{GITHUB_RUN_NUMBER}}/$GITHUB_RUN_NUMBER/g; s/{{BUILD_DATE}}/$(date)/g" version.yml.template > client/version.yml
           cat server/src/main/resources/version.yml
-
-      - name: Build
-        run: |
-          ./scripts/build-all.sh
       
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Push 
-        run: |
-            docker push instituutnederlandsetaal/galahad-proxy:dev
-            docker push instituutnederlandsetaal/galahad-server:dev
-            docker push instituutnederlandsetaal/galahad-client:dev
+      - name: Build and push
+        run: ./scripts/build-and-push-all.sh
+        env:
+          VERSION_LABEL: dev

.github/workflows/publish-prod.yml

@@ -0,0 +1,34 @@
+name: Prod images to docker
+
+on:
+  push:
+    tags: 
+      - '[0-9]+.[0-9]+.[0-9]+'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:     
+  prod-images-to-docker:
+    runs-on: ubuntu-latest
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      # The commit-version job made a commit, but default checkout still refers to the original commit that triggered this job
+      # so make sure we are looking at the right commit
+      - run: git checkout HEAD
+      - name: Version info
+        run: |
+          sed "s~{{GITHUB_REPOSITORY}}~$GITHUB_REPOSITORY~g; s/{{VERSION_LABEL}}/release/g; s/{{GITHUB_REF_TYPE}}/$GITHUB_REF_TYPE/g; s/{{GITHUB_REF_NAME}}/$GITHUB_REF_NAME/g; s/{{GITHUB_SHA}}/$GITHUB_SHA/g; s/{{GITHUB_WORKFLOW}}/$GITHUB_WORKFLOW/g; s/{{GITHUB_RUN_NUMBER}}/$GITHUB_RUN_NUMBER/g; s/{{BUILD_DATE}}/$(date)/g" version.yml.template > server/src/main/resources/version.yml
+          sed "s~{{GITHUB_REPOSITORY}}~$GITHUB_REPOSITORY~g; s/{{VERSION_LABEL}}/release/g; s/{{GITHUB_REF_TYPE}}/$GITHUB_REF_TYPE/g; s/{{GITHUB_REF_NAME}}/$GITHUB_REF_NAME/g; s/{{GITHUB_SHA}}/$GITHUB_SHA/g; s/{{GITHUB_WORKFLOW}}/$GITHUB_WORKFLOW/g; s/{{GITHUB_RUN_NUMBER}}/$GITHUB_RUN_NUMBER/g; s/{{BUILD_DATE}}/$(date)/g" version.yml.template > client/version.yml
+          cat server/src/main/resources/version.yml
+      
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        run: ./scripts/build-and-push-all.sh
+        env:
+          VERSION_LABEL: latest

client/src/views/overview/subviews/BenchmarksView.vue

@@ -77,16 +77,16 @@ const assaysStore = stores.useAssays() as AssaysStore
 const corporaStore = stores.useCorpora()
 
 // Fields
-const datasetOptions = computed(() => corporaStore.datasetCorpora.map((d) => ({ value: d.uuid, text: d.name })))
+const datasetOptions = computed(() => corporaStore.datasetCorpora.map((d) => ({ value: d.uuid, text: d.name })).sort((a, b) => a.text.localeCompare(b.text)))
 const selectedDatasetUuid = ref(null)
 const selectedDatasetName = computed(() => corporaStore.datasetCorpora.find((d) => d.uuid == selectedDatasetUuid.value)?.name)
 const metricsFilter = ref(null)
 const columns = [
     { key: "tagger", label: "tagger" },
-    { key: "precision", label: "macro\nprecision" },
-    { key: "recall", label: "macro\nrecall" },
-    { key: "f1", label: "macro\nf1" },
-    { key: "accuracy", label: "micro\naccuracy" },
+    { key: "precision", label: "macro\nprecision", sortOn: i => i.precision },
+    { key: "recall", label: "macro\nrecall", sortOn: i => i.recall },
+    { key: "f1", label: "macro\nf1", sortOn: i => i.f1 },
+    { key: "accuracy", label: "micro\naccuracy", sortOn: i => i.accuracy },
     { key: "details", label: "detailed\nevaluation" },
 ]
 /**

codemeta.json

@@ -1,8 +1,8 @@
 {
     "@context": "https://w3id.org/codemeta/3.0",
     "@type": "SoftwareSourceCode",
-    "version": "0.9.0",
-    "dateModified": "2024-05-31",
+    "version": "1.0.0",
+    "dateModified": "2024-06-04",
     "dateCreated": "2024-05-31",
     "datePublished": "2024-05-31",
     "applicationCategory": [

docker-compose.yml

@@ -1,7 +1,4 @@
 # Docker compose file for galahad client, server and proxy
-# Note: outside of swarm mode, the deploy key requires use of the --compatibility flag
-
-version: '3'
 services:
     client:
         image: instituutnederlandsetaal/galahad-client:${APP_VERSION}

readme.md

@@ -1,13 +1,14 @@
-# GaLAHaD (0.9.0)
+# GaLAHaD (1.0.0)
 Generating Linguistic Annotations for Historical Dutch
 
-[![Version, build and push to Docker Hub](https://github.com/INL/Galahad/actions/workflows/publish-dev.yml/badge.svg)](https://github.com/INL/Galahad/actions/workflows/publish-dev.yml)
+[![Dev images to docker](https://github.com/INL/Galahad/actions/workflows/publish-dev.yml/badge.svg)](https://github.com/INL/Galahad/actions/workflows/publish-dev.yml)
+[![Prod images to docker](https://github.com/INL/Galahad/actions/workflows/publish-prod.yml/badge.svg)](https://github.com/INL/Galahad/actions/workflows/publish-prod.yml)
 [![Tests](https://github.com/INL/Galahad/actions/workflows/tests.yml/badge.svg?branch=development&event=push)](https://github.com/INL/Galahad/actions/workflows/tests.yml)
 
 ### GaLAHaD-related Repositories
 - [galahad](https://github.com/INL/galahad) [you are here]
 - [galahad-train-battery](https://github.com/INL/galahad-train-battery)
-- [galahad-taggers-dockerized](https://github.com/INL/galahad-taggers-dockerized) [to be released]
+- [galahad-taggers-dockerized](https://github.com/INL/galahad-taggers-dockerized)
 - [galahad-corpus-data](https://github.com/INL/galahad-corpus-data/)
 - [int-pie](https://github.com/INL/int-pie)
 - [int-huggingface-tagger](https://github.com/INL/huggingface-tagger) [to be released]

scripts/build-and-push-all.sh

@@ -0,0 +1,10 @@
+# Set the default label
+: ${VERSION_LABEL:=dev}
+
+./scripts/build-all.sh
+
+echo "Will push galahad images with version <$VERSION_LABEL>. Set VERSION_LABEL to override this."
+
+docker push instituutnederlandsetaal/galahad-proxy:$VERSION_LABEL
+docker push instituutnederlandsetaal/galahad-server:$VERSION_LABEL
+docker push instituutnederlandsetaal/galahad-client:$VERSION_LABEL