Reverted alterations that should remain exclusive to dev branch

UAlbertaALTLab · Aug 15, 2024 · 433799f · 433799f
1 parent cdbd66b
commit 433799f
Show file tree

Hide file tree

Showing 2 changed files with 152 additions and 18 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,24 +1,20 @@
-#  WARNING: This file is autogenerated by make-yaml. Changes here
-#  will be overwritten. Edit the corresponding .template file
-#  instead.
+# WARNING: This file is autogenerated by make-yaml. Changes here
+# will be overwritten. Edit the corresponding .template file
+# instead.
 
 version: "3"
 
 services:
-  crkeng-dev:
+  crkeng:
     restart: always
     # Specify hostname to make it clearer which container is active when
     # using docker to get a shell in the container.
-    hostname: crkeng-dev-container
-    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:dev
+    hostname: crkeng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
     command: /app/app.sh crkeng
-    deploy:
-      resources:
-        limits:
-          memory: 2048M
     ports:
-      - "8211:8000" # http
-      - "9211:9191" # uWSGI stats
+      - "8011:8000" # http
+      - "9011:9191" # uWSGI stats
     volumes:
       - "./.env:/app/.env"
 
@@ -29,6 +25,144 @@ services:
       - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
       - "../src/crkeng/resources/dictionary/:/app/src/crkeng/resources/dictionary/:ro"
 
-      - "/data_local/application-data/crkeng-dev/vector_models:/app/src/crkeng/resources/vector_models/"
-      - "/data_local/application-data/crkeng-dev/db:/app/src/crkeng/db/"
-      - "/data_local/application-data/crkeng-dev/search_quality:/app/src/crkeng/CreeDictionary/search_quality/"
+      - "/data_local/application-data/crkeng/vector_models:/app/src/crkeng/resources/vector_models/"
+      - "/data_local/application-data/crkeng/db:/app/src/crkeng/db/"
+      - "/data_local/application-data/crkeng/search_quality:/app/src/crkeng/CreeDictionary/search_quality/"
+  cwdeng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: cwdeng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh cwdeng
+    ports:
+      - "8012:8000" # http
+      - "9012:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/cwdeng/resources/fst:/app/src/cwdeng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/cwdeng/resources/dictionary/:/app/src/cwdeng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/cwdeng/vector_models:/app/src/cwdeng/resources/vector_models/"
+      - "/data_local/application-data/cwdeng/db:/app/src/cwdeng/db/"
+      - "/data_local/application-data/cwdeng/search_quality:/app/src/cwdeng/CreeDictionary/search_quality/"
+  srseng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: srseng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh srseng
+    ports:
+      - "8013:8000" # http
+      - "9013:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/srseng/resources/fst:/app/src/srseng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/srseng/resources/dictionary/:/app/src/srseng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/srseng/vector_models:/app/src/srseng/resources/vector_models/"
+      - "/data_local/application-data/srseng/db:/app/src/srseng/db/"
+      - "/data_local/application-data/srseng/search_quality:/app/src/srseng/CreeDictionary/search_quality/"
+  arpeng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: arpeng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh arpeng
+    ports:
+      - "8014:8000" # http
+      - "9014:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/arpeng/resources/fst:/app/src/arpeng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/arpeng/resources/dictionary/:/app/src/arpeng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/arpeng/vector_models:/app/src/arpeng/resources/vector_models/"
+      - "/data_local/application-data/arpeng/db:/app/src/arpeng/db/"
+      - "/data_local/application-data/arpeng/search_quality:/app/src/arpeng/CreeDictionary/search_quality/"
+  hdneng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: hdneng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh hdneng
+    ports:
+      - "8015:8000" # http
+      - "9015:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/hdneng/resources/fst:/app/src/hdneng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/hdneng/resources/dictionary/:/app/src/hdneng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/hdneng/vector_models:/app/src/hdneng/resources/vector_models/"
+      - "/data_local/application-data/hdneng/db:/app/src/hdneng/db/"
+      - "/data_local/application-data/hdneng/search_quality:/app/src/hdneng/CreeDictionary/search_quality/"
+  crkLacombeeng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: crkLacombeeng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh crkLacombeeng
+    ports:
+      - "8016:8000" # http
+      - "9016:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/crkLacombeeng/resources/fst:/app/src/crkLacombeeng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/crkLacombeeng/resources/dictionary/:/app/src/crkLacombeeng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/crkLacombeeng/vector_models:/app/src/crkLacombeeng/resources/vector_models/"
+      - "/data_local/application-data/crkLacombeeng/db:/app/src/crkLacombeeng/db/"
+      - "/data_local/application-data/crkLacombeeng/search_quality:/app/src/crkLacombeeng/CreeDictionary/search_quality/"
+  blaeng:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: blaeng-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:latest
+    command: /app/app.sh blaeng
+    ports:
+      - "8017:8000" # http
+      - "9017:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/blaeng/resources/fst:/app/src/blaeng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/blaeng/resources/dictionary/:/app/src/blaeng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/blaeng/vector_models:/app/src/blaeng/resources/vector_models/"
+      - "/data_local/application-data/blaeng/db:/app/src/blaeng/db/"
+      - "/data_local/application-data/blaeng/search_quality:/app/src/blaeng/CreeDictionary/search_quality/"
diff --git a/src/crkeng/site/settings.py b/src/crkeng/site/settings.py
@@ -19,7 +19,7 @@
 from morphodict.site.settings import *
 
 # Where this application should be deployed:
-PRODUCTION_HOST = "itwewina.altlab.dev"
+PRODUCTION_HOST = "itwewina.altlab.app"
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
 
@@ -45,7 +45,7 @@
 MORPHODICT_SOURCE_LANGUAGE = "crk"
 MORPHODICT_TARGET_LANGUAGE = "eng"
 
-# MORPHODICT_PREVIEW_WARNING = False
+MORPHODICT_PREVIEW_WARNING = False
 
 MORPHODICT_SOURCE_LANGUAGE_NAME = "Plains Cree"
 MORPHODICT_SOURCE_LANGUAGE_SHORT_NAME = "Cree"
@@ -63,7 +63,7 @@
 # orthography.
 MORPHODICT_ORTHOGRAPHY = {
     # All entries in Wordform should be written in SRO (êîôâ)
-    "default": "Latn",
+    "default": "Latn-y",
     "available": {
         # 'Latn' is Okimāsis/Wolvegrey's SRO
         "Latn-y": {