CU-8699td0xq: Move to v2 model pack (#47)

* CU-8699td0xq: Move to v2 model pack

* CU-8699td0xq: Add back v1 model pack

* CU-8699td0xq: Update relevant ignore files

* CU-8699td0xq: Add v1-specific example compose file

* CU-8699td0xq: Add option to use either v1 or v2-specific compose file when testing examples

* CU-8699td0xq: Run both v1 and v2 in integration tests

Author: mart-r

.github/workflows/medcat-service_docker.yml

@@ -112,6 +112,9 @@ jobs:
   integration_test:
     runs-on: ubuntu-latest
     needs: build
+    strategy:
+      matrix:
+        variant: [v1, v2]
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -120,8 +123,8 @@ jobs:
         run: |
           echo "🧪 Running Examples test..."
           export IMAGE_TAG=${{ needs.build.outputs.image_version }} # Improve by running exact digest instead
-          echo "Running with image tag ${IMAGE_TAG}"
-          bash scripts/test_examples.sh
+          echo "Running with image tag ${IMAGE_TAG} and variant ${{ matrix.variant }}"
+          bash scripts/test_examples.sh ${{ matrix.variant }}
           
       - name: Report test result
         if: always()

medcat-service/.dockerignore

@@ -5,7 +5,7 @@ tmp_cat.log
 # skip the models directory
 models
 !models/examples
-models/examples/example-medcat-v1-model-pack
+models/examples/example-medcat-v[12]-model-pack
 
 ## Default Python .dockerignore
 # Git

medcat-service/.gitignore

@@ -12,7 +12,7 @@ __pycache__
 models/*
 !models/*.sh
 !models/examples
-models/examples/example-medcat-v1-model-pack
+models/examples/example-medcat-v[12]-model-pack
 
 # tmp folder
 tmp/*

medcat-service/docker/docker-compose.example.v1.yml

@@ -0,0 +1,10 @@
+name: cogstack-medcat-service
+services:
+  medcat-service:
+    image: cogstacksystems/medcat-service:${IMAGE_TAG-latest}
+    restart: unless-stopped
+    environment:
+      # Uses a preloaded model pack example inside the image
+      - APP_MEDCAT_MODEL_PACK=/cat/models/examples/example-medcat-v1-model-pack.zip 
+    ports:
+      - "5555:5000"

medcat-service/docker/docker-compose.example.yml

@@ -5,6 +5,6 @@ services:
     restart: unless-stopped
     environment:
       # Uses a preloaded model pack example inside the image
-      - APP_MEDCAT_MODEL_PACK=/cat/models/examples/example-medcat-v1-model-pack.zip 
+      - APP_MEDCAT_MODEL_PACK=/cat/models/examples/example-medcat-v2-model-pack.zip 
     ports:
       - "5555:5000"

medcat-service/docker/run_example_simple.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-DOCKER_COMPOSE_FILE="docker-compose.example.yml"
+DOCKER_COMPOSE_FILE_V1="docker-compose.example.v1.yml"
+DOCKER_COMPOSE_FILE_V2="docker-compose.example.yml"
+# choose between file based on CLI argument
+if [ "$1" = "v1" ]; then
+  DOCKER_COMPOSE_FILE="$DOCKER_COMPOSE_FILE_V1"
+else
+  DOCKER_COMPOSE_FILE="$DOCKER_COMPOSE_FILE_V2"
+fi
 # To run in a container run "export LOCALHOST_NAME=host.docker.internal"
 LOCALHOST_NAME=${LOCALHOST_NAME:-localhost}
 

medcat-service/models/examples/example-medcat-v2-model-pack.zip

@@ -10,7 +10,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 
 cd ${SCRIPT_DIR}/../docker
-bash run_example_simple.sh
+bash run_example_simple.sh $1
 
 # Check if health check was successful
 if [ $? -eq 0 ]; then