Merge pull request #38 from uwcirg/adding-isaccml

Adding isaccml configs

dev/default.env

@@ -23,13 +23,15 @@ COMPOSE_PROJECT_NAME=
 # ENROLLMENT_IMAGE_TAG=override-tag-name
 # MESSAGING_IMAGE_TAG=override-tag-name
 # MESSAGINGSERVICE_IMAGE_TAG=override-tag-name
+# ISACCML_IMAGE_TAG=override-tag-name
 
 # docker-compose development overrides; uncomment to enable
-# COMPOSE_FILE=docker-compose.yaml:docker-compose.dev.femr.yaml:docker-compose.dev.fhirwall.yaml:docker-compose.dev.messagingservice.yaml
+# COMPOSE_FILE=docker-compose.yaml:docker-compose.dev.femr.yaml:docker-compose.dev.fhirwall.yaml:docker-compose.dev.messagingservice.yaml:docker-compose.dev.isaccml.yaml
 
 # uncomment & modify if using above development overrides
 # FEMR_CHECKOUT_DIR=
 # FHIRWALL_CHECKOUT_DIR=
 # ENROLLMENT_CHECKOUT_DIR=
 # MESSAGING_CHECKOUT_DIR=
 # MESSAGINGSERVICE_CHECKOUT_DIR=
+# ISACCML_CHECKOUT_DIR=

dev/docker-compose.dev.isaccml.yaml

@@ -0,0 +1,11 @@
+# docker-compose development override for messaging service
+---
+version: "3.7"
+services:
+  isaccml:
+    command: sh -c "cd /opt/app && flask run --host 0.0.0.0 --port ${PORT:-8000}"
+    environment:
+      FLASK_ENV: development
+    volumes:
+    # set in .env
+      - "${ISACCML_CHECKOUT_DIR}/:/opt/app"

dev/docker-compose.prod.yaml

@@ -30,3 +30,6 @@ services:
 
   messagingservice:
     restart: unless-stopped
+
+  isaccml:
+    restart: unless-stopped

dev/docker-compose.yaml

@@ -253,9 +253,9 @@ services:
       FHIR_URL:  "http://fhir-internal:8080/fhir/"
       LOGSERVER_URL: "https://logs.${BASE_DOMAIN:-localtest.me}"
       TWILIO_WEBHOOK_CALLBACK: "https://messagingservice.${BASE_DOMAIN:-localtest.me}"
-      # Define location of model to use ML for incoming SMS "urgency"
+      # Define address hosting the model to use ML for incoming SMS "urgency"
       # Commented out to avoid filling logs with file not found noise
-      # TORCH_MODEL_PATH: /opt/app/config/models/model_for_isacc
+      # ML_SERVICE_ADDRESS: "http://isaccml:8000"
       ISACC_NOTIFICATION_EMAIL_SENDER_NAME: noreply@femr.${BASE_DOMAIN:-localtest.me}
       ISACC_SUPPORT_EMAIL: ccstudyteam@uw.edu
 
@@ -276,6 +276,21 @@ services:
     depends_on:
       - redis
 
+  isaccml:
+    image: ghcr.io/uwcirg/isacc-ml:${ISACCML_IMAGE_TAG:-main}
+    environment:
+      LOGSERVER_URL: "https://logs.${BASE_DOMAIN:-localtest.me}"
+      # Define path to the model to use ML for incoming SMS "urgency"
+      # Commented out to avoid filling logs with file not found noise
+      TORCH_MODEL_PATH: "/opt/app/config/models/model_for_isacc"
+
+    env_file:
+      - isaccml.env
+    volumes:
+      - ./config/messagingservice:/opt/app/config:ro
+    networks:
+      - internal
+
 volumes:
   db-data: {}
 

dev/isaccml.env.default

@@ -0,0 +1,9 @@
+# Example docker-compose environment file
+# Copy to isaccml.env and modify as necessary
+# https://docs.docker.com/compose/env-file/
+
+# Variables defined in this file will only be available to containers/images
+# ie not for interpolation in docker-compose YAML files
+SECRET_KEY=
+
+# TORCH_MODEL_PATH=