Fix ALTO xml preview

.github/workflows/test.yml

@@ -38,3 +38,18 @@ jobs:
 
       - name: Run pytest
         run: pytest
+
+  test-alto:
+    name: Test Alto XML
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Pull docker images to run ALTO XML test
+        run: cd test-alto && docker compose pull
+
+      - name: Run ALTO XML test
+        run: cd test-alto && bash test-alto-batch.sh example-file/0001.xml

.gitignore

@@ -12,7 +12,3 @@ dist/
 
 src/lp_labelstudio/web_server/test_images/*.json
 .env
-
-test_batches/*
-!test_batches/default_mets.xml
-!test_batches/create_awardee_title.py

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "open-oni"]
-	path = open-oni
+	path = test-alto/open-oni
 	url = [email protected]:codemyriad/open-oni.git
         branch = masca

test-alto/.gitignore

@@ -0,0 +1,3 @@
+test_batches/*
+!test_batches/default_mets.xml
+!test_batches/create_awardee_title.py

how-to-test-alto-xml.md → test-alto/how-to-test-alto-xml.md

@@ -2,7 +2,7 @@
 
 Setup Open ONI as submodule. This is needed since the open-oni folder will be mounted in the `web` container.
 
-    `git submodule --init --checkout`
+    `git submodule update --init --checkout`
 
 Than you should be able to test an XML Alto file with:
 
@@ -21,3 +21,12 @@ The script will lookup for a .jpeg image in the same directory and with the same
         |-- 0001.jpeg
 
 One can reset all data by removing the docker peristent volumes `data-mariadb` and `data-solr`.
+
+
+Data reset
+----------
+
+To reset local state run
+
+    docker compose down
+    docker volume rm test-alto_data-solr test-alto_data-mariadb

test-alto-batch.sh → test-alto/test-alto-batch.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+cd "$(dirname "$0")"
 
 # Check if input file is provided
 if [ $# -eq 0 ]; then
@@ -77,20 +78,25 @@ if [ ! -f "$DOCKER_COMPOSE_PATH" ]; then
     exit 1
 fi
 
-# Stop any existing Open ONI containers
-docker compose -f "$DOCKER_COMPOSE_PATH" down
-
 # Start Docker Compose with batch mounted
 docker compose -f "$DOCKER_COMPOSE_PATH" up -d
 
 # Wait for the container to fully start
-sleep 15
+timeout=90
+until docker compose logs web | grep -q "ONI setup successful"; do
+ if [ $timeout -le 0 ]; then
+   echo "Timeout waiting for ONI setup"
+   exit 1
+ fi
+ sleep 3
+ timeout=$((timeout-5))
+done
 
 # Create Awardee and Title objects if they don't exists
 docker compose -f "$DOCKER_COMPOSE_PATH" exec -T web bash -c "source ENV/bin/activate && python manage.py shell < /opt/create_awardee_title.py"
 
 # Purge the batch if it exists in Open ONI
-docker compose -f "$DOCKER_COMPOSE_PATH" exec -T web bash -c "source ENV/bin/activate && python manage.py purge_batch $BATCH_NAME"
+docker compose -f "$DOCKER_COMPOSE_PATH" exec -T web bash -c "source ENV/bin/activate && (python manage.py batches | grep -q '^$BATCH_NAME$' && python manage.py purge_batch $BATCH_NAME; true)"
 
 # Load the batch into Open ONI
 docker compose -f "$DOCKER_COMPOSE_PATH" exec -T web bash -c "source ENV/bin/activate && python manage.py load_batch /opt/openoni/data/batches/$BATCH_NAME"