diff --git a/cg/apps/hermes/hermes_api.py b/cg/apps/hermes/hermes_api.py index 3bae253f18..fec6968e15 100644 --- a/cg/apps/hermes/hermes_api.py +++ b/cg/apps/hermes/hermes_api.py @@ -18,6 +18,7 @@ def __init__(self, config: dict): self.process = Process( binary=config["hermes"]["binary_path"], ) + self.container_path: str = config["hermes"]["container_path"] self.container_mount_volume = config["hermes"]["container_mount_volume"] def convert_deliverables( @@ -33,7 +34,7 @@ def convert_deliverables( "run", "--bind", self.container_mount_volume, - "/home/proj/stage/singularity_containers/hermes_latest.sif", + self.container_path, "convert", "deliverables", "--workflow", diff --git a/cg/models/cg_config.py b/cg/models/cg_config.py index 54cea8deb1..803c7d0d9d 100644 --- a/cg/models/cg_config.py +++ b/cg/models/cg_config.py @@ -27,9 +27,7 @@ from cg.meta.delivery.delivery import DeliveryAPI from cg.services.analysis_service.analysis_service import AnalysisService from cg.services.decompression_service.decompressor import Decompressor -from cg.services.deliver_files.factory import ( - DeliveryServiceFactory, -) +from cg.services.deliver_files.factory import DeliveryServiceFactory from cg.services.deliver_files.rsync.models import RsyncDeliveryConfig from cg.services.deliver_files.rsync.service import DeliveryRsyncService from cg.services.fastq_concatenation_service.fastq_concatenation_service import ( @@ -147,6 +145,10 @@ class CommonAppConfig(BaseModel): container_mount_volume: str | None = None +class HermesConfig(CommonAppConfig): + container_path: str + + class FluffyUploadConfig(BaseModel): user: str password: str @@ -425,7 +427,7 @@ class CGConfig(BaseModel): genotype_api_: GenotypeAPI = None gens: CommonAppConfig = None gens_api_: GensAPI = None - hermes: CommonAppConfig = None + hermes: HermesConfig = None hermes_api_: HermesApi = None janus: ClientConfig | None = None janus_api_: JanusAPIClient | None = None