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 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: 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