“Ende seget datmen daer doe wan
diff --git a/client/src/views/application/subviews/AboutView.vue b/client/src/views/application/subviews/AboutView.vue
index 664d1e4..a012091 100644
--- a/client/src/views/application/subviews/AboutView.vue
+++ b/client/src/views/application/subviews/AboutView.vue
@@ -1,21 +1,32 @@
-
- Here you can find some information about the application and the exact version you are currently
- running.
-
-
-
-
-
Galahad is created by the
-
- Dutch Language Institute
-
+
+
+
+ Here you can find information about the application and the exact version you are
+ currently running.
+
+
+ GaLAHaD is created by the Dutch Language Institute
+ .
+
+ For this work, funding was received from NWO (Clariah Plus project 184.034.023).
+
+
+
Version
-
-
+
+
diff --git a/client/src/views/contribute/subviews/ContributeTaggersView.vue b/client/src/views/contribute/subviews/ContributeTaggersView.vue
index 86393fe..a90cb01 100644
--- a/client/src/views/contribute/subviews/ContributeTaggersView.vue
+++ b/client/src/views/contribute/subviews/ContributeTaggersView.vue
@@ -1,77 +1,21 @@
-
- Contribute a tagger
- Creating linguistic infrastructure is a lot of work. Why not do it together?
- If you have trained your own tagger, you can opt to make it available through Galahad. Read below how this works.
-
-
- Docker
-
-
- Galahad uses embedded Docker containers running the taggers. You can share your tagger as a Docker image with us
- and
- other researchers. The easiest way to create a Docker image that implements the basic Galahad API is to extend
- from
- the galahad-tagger-base image. You can get it from the docker hub.
-
-
-
- Get
- instituutnederlandsetaal/galahad-tagger-base from hub.docker.com (This docker repository
- may not
- be public during beta.)
-
-
-
- Specifications
-
- You need to provide some specifications of your tagger in a yaml file.
- The file will be named TAGGER_ID.yml
.
- So a tagger named 'my-tagger' needs to provide a my-tagger.yaml
file that looks like:
-
-
-
-
-# my-tagger.yaml
-description: "This is a short description of my tagger."
-tagset: TDN # Or any other tagset
-eraFrom: "0"
-eraTo: "2020"
-produces: # List of the output types of my-tagger
-- LEM
-- POS
-- TOK
-attributions: # List any number of attributions
-creator: galahad dev
-links: # List any number of links
-- name: website
-href: https://ivdnt.org
-
-
- (subject to change during beta.)
-
-
-
- Github
-
- For more info and examples see our Github
-
-
-
-
- INL/Galahad and
- INL/galahad-taggers-dockerized
- at github.com (Repository may not be public during beta.)
-
-
- Base images for several frameworks already exist. To read how to submit a tagger created with such a framework, see
- examples on GitHub.
-
-
+
+
+ Contribute a tagger
+
+ If you have trained your own tagger, you can make it available on GaLAHaD.
+ This works by creating a Docker container for it with a GaLAHaD-standardized API. A base
+ implementation is
+ available on our GitHub.
+
+
+ See galahad-taggers-dockerized
+ for more information.
+
+
+
-
diff --git a/client/src/views/help/HelpView.vue b/client/src/views/help/HelpView.vue
index 5552777..e054ecc 100644
--- a/client/src/views/help/HelpView.vue
+++ b/client/src/views/help/HelpView.vue
@@ -1,15 +1,14 @@
+ { id: 'general', title: 'General' },
+ { id: 'formats', title: 'Formats' }
+ ]" />
-
diff --git a/client/src/views/overview/subviews/TagsetsView.vue b/client/src/views/overview/subviews/TagsetsView.vue
index 13c16ab..b08e1d8 100644
--- a/client/src/views/overview/subviews/TagsetsView.vue
+++ b/client/src/views/overview/subviews/TagsetsView.vue
@@ -2,7 +2,8 @@
- Here you can see an overview of all tagsets used by the benchmark corpora.
+ Here you can see an overview of possible tagsets to annotate Dutch. Currently only TDN-Core is used in
+ the platform.
diff --git a/codemeta.json b/codemeta-harvest.json
similarity index 93%
rename from codemeta.json
rename to codemeta-harvest.json
index c52f804..1a821d5 100644
--- a/codemeta.json
+++ b/codemeta-harvest.json
@@ -1,32 +1,29 @@
{
"@context": "https://w3id.org/codemeta/3.0",
"@type": "SoftwareSourceCode",
- "version": "1.0.0",
- "dateModified": "2024-06-04",
"dateCreated": "2024-05-31",
"datePublished": "2024-05-31",
"applicationCategory": [
"https://w3id.org/nwo-research-fields#Linguistics",
"https://w3id.org/nwo-research-fields#ComputationalLinguisticsAndPhilology",
"https://w3id.org/nwo-research-fields#ArtificialIntelligenceExpertSystems",
- "https://w3id.org/nwo-research-fields#SoftwareForTheHumanities",
+ "https://w3id.org/nwo-research-fields#SoftwareForHumanities",
"https://w3id.org/nwo-research-fields#TextualAndLinguisticCorpora",
- "https://vocabs.dariah.eu/tadirah/en/page/enriching",
- "https://vocabs.dariah.eu/tadirah/en/page/posTagging",
- "https://vocabs.dariah.eu/tadirah/en/page/tagging",
- "https://vocabs.dariah.eu/tadirah/en/page/annotating",
- "https://vocabs.dariah.eu/tadirah/en/page/merging",
- "https://vocabs.dariah.eu/tadirah/en/page/converting",
- "https://vocabs.dariah.eu/tadirah/en/page/lemmatizing",
- "https://vocabs.dariah.eu/tadirah/en/page/machineLearning",
- "https://vocabs.dariah.eu/tadirah/en/page/comparing",
- "https://vocabs.dariah.eu/tadirah/en/page/analyzing"
+ "https://vocabs.dariah.eu/tadirah/enriching",
+ "https://vocabs.dariah.eu/tadirah/posTagging",
+ "https://vocabs.dariah.eu/tadirah/tagging",
+ "https://vocabs.dariah.eu/tadirah/annotating",
+ "https://vocabs.dariah.eu/tadirah/merging",
+ "https://vocabs.dariah.eu/tadirah/converting",
+ "https://vocabs.dariah.eu/tadirah/lemmatizing",
+ "https://vocabs.dariah.eu/tadirah/machineLearning",
+ "https://vocabs.dariah.eu/tadirah/comparing",
+ "https://vocabs.dariah.eu/tadirah/analyzing"
],
"author": [
{
"@type": "Person",
"@id": "http://orcid.org/0009-0006-9941-9582",
- "type": "Person",
"email": "vincent.prins@ivdnt.org",
"familyName": "Prins",
"givenName": "Vincent"
diff --git a/readme.md b/readme.md
index 5a819c6..6c0cb5c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# GaLAHaD (1.0.0)
+# GaLAHaD
Generating Linguistic Annotations for Historical Dutch
[![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)
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
old mode 100644
new mode 100755
index 9a1a102..332862b
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,86 +1,8 @@
-#!/bin/bash
-# Automatically redeploy the application
-# This script will change the state of the server
-# So make sure you know what you are doing!
-
-# Optionally you can run a cronjob for this deployment
-# to enable continuous deployment.
-# Open crontab configuration with: crontab -e
-# and add a line like: */5 * * * * cd /path/to/dir && yes | ./scripts/deploy.sh >> /path/to/logdir/deployment.log 2>&1
-# THIS WILL OVERRIDE PREVIOUS DEPLOYMENTS, MAKE SURE YOU KNOW WHAT YOU ARE DOING!
-# I doubt you want this for a production server
-
-start=`date +%s`
-
-# exit when any command fails
-set -e
-
-# keep track of the last executed command
-trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-# echo an error message before exiting
-trap 'exit_code=$?; final_command=$last_command;
-if [ $exit_code -ne 0 ]; then
- echo "\"${final_command}\" command failed with exit code $exit_code. Please fix the error and rerun the deployment. Current deployment maybe in an incomplete state."
-fi' EXIT
-
-echo ""
-echo "--------------------------------------------------------------------------"
-echo "$(date) $(realpath $0)"
-echo ""
-echo "Update and redeploy application, this will execute:"
-echo " - git pull"
-echo " - docker compose pull"
-echo " - docker compose up"
-echo " - docker image prune"
-echo ""
-echo "Optionally:"
-echo " - reset server data"
-echo ""
-while true; do
- read -p "Do you know what you are doing? " yn
- case $yn in
- [Yy]* ) break;;
- [Nn]* ) echo "You could start by reading $0 or visit https://github.com/INL/Galahad"; exit;;
- * ) echo "Please answer yes or no.";;
- esac
-done
-while true; do
- read -p "Are you sure? " yn
- case $yn in
- [Yy]* ) break;;
- [Nn]* ) echo "Ok then, keep your secrets"; exit;;
- * ) echo "Please answer yes or no.";;
- esac
-done
-
-echo "Very well, deploy will now begin"
-echo ""
-
git pull | while IFS= read -r line; do printf '[%s git pull] %s\n' "$(date '+%H:%M:%S')" "$line"; done
-echo ""
+echo ""
docker compose pull | while IFS= read -r line; do printf '[%s docker compose pull] %s\n' "$(date '+%H:%M:%S')" "$line"; done
echo ""
-docker compose --compatibility up -d | while IFS= read -r line; do printf '[%s docker compose up] %s\n' "$(date '+%H:%M:%S')" "$line"; done
+docker compose up -d | while IFS= read -r line; do printf '[%s docker compose up] %s\n' "$(date '+%H:%M:%S')" "$line"; done
echo ""
yes | docker image prune | while IFS= read -r line; do printf '[%s docker image prune] %s\n' "$(date '+%H:%M:%S')" "$line"; done
-echo ""
-
-# reset the data
-while true; do
- read -p "Do you want to rest server data (formats, taggers, tagsets)?
- [Note: to avoid accidentaly removing user data, private corpora always need to be reset manually.]
-" yn
- case $yn in
- [Yy]* ) echo "I will reset the data"; ./scripts/reset-data.sh; break;;
- [Nn]* ) echo "I will not reset the data"; break;;
- * ) echo "Please answer yes or no.";;
- esac
-done
-
-echo "$(date) deployment finished."
-echo "Visit https://github.com/INL/Galahad for more"
-end=`date +%s`
-runtime=$((end-start))
-echo "Runtime $runtime seconds"
-echo "--------------------------------------------------------------------------"
-echo ""
+echo ""
\ No newline at end of file
diff --git a/scripts/reset-data.sh b/scripts/reset-data.sh
deleted file mode 100644
index a1f6b05..0000000
--- a/scripts/reset-data.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# This script resets/updates the data in the docker volumes to the data in the repo
-#
-# Note: we require jq. Feel free to write an implementation without jq.
-
-echo "docker volume ls:"
-docker volume ls
-
-echo ""
-echo "resetting formats ..."
-FORMATS_DIR=$(docker inspect galahad_formats-volume | jq -r '.[0].Mountpoint')
-# Somehow the rm fails. TODO fix it.
-rm -v --interactive=never "$FORMATS_DIR/*"
-cp -v ./server/data/formats/* $FORMATS_DIR
-echo "Available formats are:"
-ls $FORMATS_DIR
-
-echo ""
-echo "resetting taggers ..."
-TAGGERS_DIR=$(docker inspect galahad_taggers-volume | jq -r '.[0].Mountpoint')
-rm -v --interactive=never "$TAGGERS_DIR/*"
-cp -v ./server/data/taggers/* $TAGGERS_DIR
-echo "Available taggers are:"
-ls $TAGGERS_DIR
-
-echo ""
-echo "resetting tagsets ..."
-TAGSETS_DIR=$(docker inspect galahad_tagsets-volume | jq -r '.[0].Mountpoint')
-rm -v --interactive=never "$TAGSETS_DIR/*"
-cp -v ./server/data/tagsets/* $TAGSETS_DIR
-echo "Available tagsets are:"
-ls $TAGSETS_DIR
diff --git a/server/application.properties b/server/application.properties
index e29cc9c..45f3c27 100644
--- a/server/application.properties
+++ b/server/application.properties
@@ -6,6 +6,6 @@ springdoc.swagger-ui.disable-swagger-default-url=true
server.use-forward-headers=true
server.forward-headers-strategy=framework
-#springdoc.swagger-ui.config-url=/galahad/api/v3/api-docs/swagger-config
-#springdoc.swagger-ui.path=/swagger-ui.html
-#springdoc.swagger-ui.url=/galahad/api/v3/api-docs
\ No newline at end of file
+springdoc.swagger-ui.config-url=/galahad/api/v3/api-docs/swagger-config
+springdoc.swagger-ui.path=/swagger-ui.html
+springdoc.swagger-ui.url=/galahad/api/v3/api-docs
\ No newline at end of file
diff --git a/server/data/taggers/pie-tdn-1400-1600.yaml b/server/data/taggers/pie-tdn-1400-1600.yaml
index 7075fe7..b4ce628 100644
--- a/server/data/taggers/pie-tdn-1400-1600.yaml
+++ b/server/data/taggers/pie-tdn-1400-1600.yaml
@@ -9,7 +9,7 @@ produces:
- TOK
model:
name: pie-tdn-1400-1600
- href: https://github.com/INL/galahad-taggers-dockerized/tree/1.0.0/pie/tdn-1400-1600
+ href: https://github.com/INL/galahad-taggers-dockerized/tree/1.0.0/pie/TDN-1400-1600
software:
name: int-pie
href: https://github.com/INL/int-pie/tree/1.0.0
diff --git a/server/data/taggers/pie-tdn-1600-1900.yaml b/server/data/taggers/pie-tdn-1600-1900.yaml
index 5a2ddbf..943f64e 100644
--- a/server/data/taggers/pie-tdn-1600-1900.yaml
+++ b/server/data/taggers/pie-tdn-1600-1900.yaml
@@ -9,7 +9,7 @@ produces:
- TOK
model:
name: pie-tdn-1600-1900
- href: https://github.com/INL/galahad-taggers-dockerized/tree/1.0.0/pie/tdn-1600-1900
+ href: https://github.com/INL/galahad-taggers-dockerized/tree/1.0.0/pie/TDN-1600-1900
software:
name: int-pie
href: https://github.com/INL/int-pie/tree/1.0.0