Skip to content

Commit af7fe3c

Browse files
authored
Fix raredisease custom images (#3877)
### Fixed - Custom images where also added while empty, causing an error in the scout upload. Now only adding custom images if images are present
1 parent 4e4abfe commit af7fe3c

File tree

2 files changed

+38
-27
lines changed

2 files changed

+38
-27
lines changed

cg/meta/upload/scout/raredisease_config_builder.py

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,33 @@ def build_load_config(self) -> RarediseaseLoadConfig:
6161
self.include_case_files(load_config)
6262
self.get_sample_information(load_config)
6363
self.include_pedigree_picture(load_config)
64-
load_config.custom_images = self.load_custom_image_sample()
64+
self.load_custom_image_sample(load_config)
6565
load_config.human_genome_build = GenomeBuild.hg19
6666
return load_config
6767

68-
def load_custom_image_sample(self) -> CustomImages:
68+
def load_custom_image_sample(self, load_config: RarediseaseLoadConfig) -> None:
6969
"""Build custom images config."""
7070
LOG.info("Adding custom images")
71+
7172
eklipse_images: list = []
72-
for db_sample in self.analysis_obj.case.links:
73-
sample_id: str = db_sample.sample.internal_id
74-
eklipse_image = Eklipse(
75-
title=sample_id,
76-
path=self.get_file_from_hk(hk_tags=self.sample_tags.eklipse_path),
77-
description="eKLIPse MT images",
78-
width="800",
79-
height="800",
73+
for sample in self.analysis_obj.case.samples:
74+
sample_id: str = sample.internal_id
75+
eklipse_image_path = self.get_file_from_hk(
76+
hk_tags=set(self.sample_tags.eklipse_path).union({sample_id})
8077
)
81-
eklipse_images.append(eklipse_image)
82-
83-
case_images = CaseImages(eKLIPse=eklipse_images)
84-
config_custom_images = CustomImages(case_images=case_images)
85-
return config_custom_images
78+
if eklipse_image_path:
79+
eklipse_image = Eklipse(
80+
title=sample_id,
81+
path=eklipse_image_path,
82+
description="eKLIPse MT images",
83+
width="800",
84+
height="800",
85+
)
86+
eklipse_images.append(eklipse_image)
87+
if eklipse_images:
88+
case_images = CaseImages(eKLIPse=eklipse_images)
89+
config_custom_images = CustomImages(case_images=case_images)
90+
load_config.custom_images = config_custom_images
8691

8792
def include_case_files(self, load_config: RarediseaseLoadConfig) -> None:
8893
"""Include case level files for mip case."""

cg/models/cg_config.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
from cg.services.deliver_files.deliver_files_service.deliver_files_service_factory import (
3131
DeliveryServiceFactory,
3232
)
33-
from cg.services.deliver_files.rsync.service import (
34-
DeliveryRsyncService,
35-
)
3633
from cg.services.deliver_files.rsync.models import RsyncDeliveryConfig
34+
from cg.services.deliver_files.rsync.service import DeliveryRsyncService
3735
from cg.services.fastq_concatenation_service.fastq_concatenation_service import (
3836
FastqConcatenationService,
3937
)
@@ -47,13 +45,21 @@
4745
from cg.services.run_devices.pacbio.housekeeper_service.pacbio_houskeeper_service import (
4846
PacBioHousekeeperService,
4947
)
50-
from cg.services.run_devices.pacbio.metrics_parser.metrics_parser import PacBioMetricsParser
51-
from cg.services.run_devices.pacbio.post_processing_service import PacBioPostProcessingService
48+
from cg.services.run_devices.pacbio.metrics_parser.metrics_parser import (
49+
PacBioMetricsParser,
50+
)
51+
from cg.services.run_devices.pacbio.post_processing_service import (
52+
PacBioPostProcessingService,
53+
)
5254
from cg.services.run_devices.pacbio.run_data_generator.pacbio_run_data_generator import (
5355
PacBioRunDataGenerator,
5456
)
55-
from cg.services.run_devices.pacbio.run_file_manager.run_file_manager import PacBioRunFileManager
56-
from cg.services.run_devices.pacbio.run_validator.pacbio_run_validator import PacBioRunValidator
57+
from cg.services.run_devices.pacbio.run_file_manager.run_file_manager import (
58+
PacBioRunFileManager,
59+
)
60+
from cg.services.run_devices.pacbio.run_validator.pacbio_run_validator import (
61+
PacBioRunValidator,
62+
)
5763
from cg.services.run_devices.run_names.pacbio import PacbioRunNamesService
5864
from cg.services.sequencing_qc_service.sequencing_qc_service import SequencingQCService
5965
from cg.services.slurm_service.slurm_cli_service import SlurmCLIService
@@ -248,18 +254,18 @@ class TomteConfig(CommonAppConfig):
248254

249255

250256
class RnafusionConfig(CommonAppConfig):
251-
root: str
252-
references: str
253257
binary_path: str
254-
workflow_path: str
255-
conda_env: str
256258
compute_env: str
257-
profile: str
258259
conda_binary: str | None = None
260+
conda_env: str
259261
launch_directory: str
262+
profile: str
263+
references: str
260264
revision: str
265+
root: str
261266
slurm: SlurmConfig
262267
tower_workflow: str
268+
workflow_path: str
263269

264270

265271
class TaxprofilerConfig(CommonAppConfig):

0 commit comments

Comments
 (0)