From 7566239a7792235bf0cf1df4d5eba10e9c289589 Mon Sep 17 00:00:00 2001 From: Tom Searle Date: Thu, 19 Sep 2024 17:47:45 +0100 Subject: [PATCH 1/3] CU-8695w36y1: fix for metric report loading --- webapp/api/api/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/api/api/metrics.py b/webapp/api/api/metrics.py index d9d2fe61..918f71da 100644 --- a/webapp/api/api/metrics.py +++ b/webapp/api/api/metrics.py @@ -43,7 +43,7 @@ def calculate_metrics(project_ids: List[int], report_name: str): """ logger.info('Calculating metrics for report: %s', report_name) projects = [ProjectAnnotateEntities.objects.filter(id=p_id).first() for p_id in project_ids] - if projects[0].cdb is None: + if projects[0].model_pack: # assume the model pack is set. cat = CAT.load_model_pack(projects[0].model_pack.model_pack.path) else: From 036fd9325ef69ea881a77973608e84c566387650 Mon Sep 17 00:00:00 2001 From: tomolopolis Date: Fri, 20 Sep 2024 11:00:39 +0100 Subject: [PATCH 2/3] CU-8695wf9e2: fix path reference when checking that CDB loads correctly before accepting upload. --- webapp/api/api/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/api/api/models.py b/webapp/api/api/models.py index 0bfccd8c..e7749f0f 100644 --- a/webapp/api/api/models.py +++ b/webapp/api/api/models.py @@ -114,7 +114,7 @@ def save(self, *args, skip_load=False, **kwargs, ): # load the CDB, and raise if this fails. if not skip_load: try: - CDB.load(self.cdb_file) + CDB.load(self.cdb_file.path) except Exception as exc: raise MedCATLoadException(f'Failed to load Concept DB from {self.cdb_file}, ' f'check if this CDB file successfully loads elsewhere') from exc From ce04429a8d8aa6580bf122dc887e423798be26ca Mon Sep 17 00:00:00 2001 From: Tom Searle Date: Fri, 20 Sep 2024 16:08:05 +0100 Subject: [PATCH 3/3] update to the latest patch release --- docker-compose-prod.yml | 6 +++--- docker-compose.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 07ecb552..535c5cdc 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -5,7 +5,7 @@ services: container_name: medcattrainer hostname: medcat restart: always - image: cogstacksystems/medcat-trainer:v2.17.0 + image: cogstacksystems/medcat-trainer:v2.17.1 volumes: - ./configs:/home/configs - api-media:/home/api/media @@ -17,12 +17,12 @@ services: env_file: - ./envs/env-prod environment: - - MCT_VERSION=v2.17.0 + - MCT_VERSION=v2.17.1 command: /home/scripts/run.sh # crontab - for db backup medcattrainer-db-backup: - image: cogstacksystems/medcat-trainer:v2.17.0 + image: cogstacksystems/medcat-trainer:v2.17.1 restart: always volumes: - ./configs:/home/configs diff --git a/docker-compose.yml b/docker-compose.yml index a61c559d..4f226645 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: medcattrainer: - image: cogstacksystems/medcat-trainer:v2.17.0 + image: cogstacksystems/medcat-trainer:v2.17.1 restart: always volumes: - ./configs:/home/configs @@ -14,12 +14,12 @@ services: env_file: - ./envs/env environment: - - MCT_VERSION=v2.17.0 + - MCT_VERSION=v2.17.1 command: /home/scripts/run.sh # crontab - for db backup medcattrainer-db-backup: - image: cogstacksystems/medcat-trainer:v2.17.0 + image: cogstacksystems/medcat-trainer:v2.17.1 restart: always volumes: - ./configs:/home/configs