Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CU-8695x1dy9: Changes for running predictions async in a bg process #214

Merged
merged 16 commits into from
Nov 29, 2024
Merged

CU-8695x1dy9: Changes for running predictions async in a bg process #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
30ebe9a
CU-8695x1dy9: runs model in background process, run process_tasks in…
tomolopolis Sep 23, 2024
e452d64
CU-8695xcr4k: fix styling of meta-annos for both model pack pred scen…
tomolopolis Oct 3, 2024
47fa649
Merge pull request #215 from CogStack/meta-anno-click-event-bug
tomolopolis Oct 3, 2024
29d9eb8
CU-86961hrm5: Fix bubbling up of keydown events when typing numbers i…
tomolopolis Oct 3, 2024
f6d0a76
Merge pull request #216 from CogStack/meta-anno-click-event-bug
tomolopolis Oct 3, 2024
6be8ab2
bump to latest release
tomolopolis Oct 4, 2024
461af16
fix: vocab_file should be saved before loading
yangnoahlin Oct 22, 2024
d1865f6
Merge pull request #217 from yangnoahlin/master
tomolopolis Oct 30, 2024
3d76a5d
CU-8696ent8k: vue3 upgrade and migration from bootstrap-vue UI framew…
tomolopolis Nov 3, 2024
7c49911
Merge pull request #220 from CogStack/vue3-upgrade
tomolopolis Nov 25, 2024
5d6a3fd
CU-8695x1dy9: runs model in background process, run process_tasks in …
tomolopolis Sep 23, 2024
84f186b
Merge remote-tracking branch 'origin/bg-process-preds' into bg-proces…
tomolopolis Nov 26, 2024
9bc32e6
CU-8696ent8k: fix bg process running cancellation and into project entry
tomolopolis Nov 28, 2024
7b9169e
CU-8696ent8k: fix tooltip for concept search
tomolopolis Nov 28, 2024
8093d3d
CU-8696ent8k: increase timeout, and ensure database locked errors do …
tomolopolis Nov 28, 2024
92ac80f
CU-8696ent8k: make prep_docs AnnotationEntity addition atomic.
tomolopolis Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
context: ./webapp
args:
SPACY_MODELS: ${SPACY_MODELS:-en_core_web_md}
image: medcattrainer-api
restart: always
volumes:
- ./webapp/api/core:/home/api/core
Expand All @@ -23,6 +24,25 @@ services:
- MCT_VERSION=latest
command: /home/scripts/run.sh

# bg process task runner
medcattrainer-bg-process:
image: medcattrainer-api
depends_on:
- medcattrainer
restart: always
volumes:
- ./webapp/api/core:/home/api/core
- ./webapp/api/api:/home/api/api
- ./webapp/scripts/run-bg-process.sh:/home/scripts/run-bg-process.sh
- ./configs:/home/configs
- api-media:/home/api/media
- api-static:/home/api/static
- api-db:/home/api/db
env_file:
- ./envs/env
command: /home/scripts/run-bg-process.sh


nginx:
image: nginx
restart: always
Expand Down
20 changes: 17 additions & 3 deletions docker-compose-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
container_name: medcattrainer
hostname: medcat
restart: always
image: cogstacksystems/medcat-trainer:v2.17.3
image: cogstacksystems/medcat-trainer:v2.17.4
volumes:
- ./configs:/home/configs
- api-media:/home/api/media
Expand All @@ -17,12 +17,26 @@ services:
env_file:
- ./envs/env-prod
environment:
- MCT_VERSION=v2.17.3
- MCT_VERSION=v2.17.4
command: /home/scripts/run.sh

# bg process task runner
medcattrainer-bg-process:
image: cogstacksystems/medcat-trainer:v2.17.1
restart: always
volumes:
- ./configs:/home/configs
- api-media:/home/api/media
- api-static:/home/api/static
- api-db:/home/api/db
- api-db-backup:/home/api/db-backup
env_file:
- ./envs/env
command: /home/scripts/run-bg-process.sh

# crontab - for db backup
medcattrainer-db-backup:
image: cogstacksystems/medcat-trainer:v2.17.3
image: cogstacksystems/medcat-trainer:v2.17.4
restart: always
volumes:
- ./configs:/home/configs
Expand Down
21 changes: 18 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
# projects are not used.

services:
# api server
medcattrainer:
image: cogstacksystems/medcat-trainer:v2.17.3
image: cogstacksystems/medcat-trainer:v2.17.4
restart: always
volumes:
- ./configs:/home/configs
Expand All @@ -14,12 +15,26 @@ services:
env_file:
- ./envs/env
environment:
- MCT_VERSION=v2.17.3
- MCT_VERSION=v2.17.4
command: /home/scripts/run.sh

# bg process task runner
medcattrainer-bg-process:
image: cogstacksystems/medcat-trainer:v2.17.4
restart: always
volumes:
- ./configs:/home/configs
- api-media:/home/api/media
- api-static:/home/api/static
- api-db:/home/api/db
- api-db-backup:/home/api/db-backup
env_file:
- ./envs/env
command: /home/scripts/run-bg-process.sh

# crontab - for db backup
medcattrainer-db-backup:
image: cogstacksystems/medcat-trainer:v2.17.3
image: cogstacksystems/medcat-trainer:v2.17.4
restart: always
volumes:
- ./configs:/home/configs
Expand Down
2 changes: 2 additions & 0 deletions envs/env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ OPENBLAS_NUM_THREADS=1

### MedCAT cfg ###
MEDCAT_CONFIG_FILE=/home/configs/base.txt
# number of MedCAT models that can be cached, run in bg processes at any one time
MAX_MEDCAT_MODELS=2

### Deployment Realm ###
ENV=non-prod
Expand Down
2 changes: 2 additions & 0 deletions envs/env-prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ OPENBLAS_NUM_THREADS=1

### MedCAT cfg ###
MEDCAT_CONFIG_FILE=/home/configs/base.txt
# number of MedCAT models that can be cached, run in bg processes at any one time
MAX_MEDCAT_MODELS=2
ENV=prod

# SECRET KEY - edit this for prod deployments,
Expand Down
Loading