Merge pull request #1384 from mskcc/master

master to develop
mskcc · Nov 29, 2024 · 563d541 · 563d541
2 parents 354b945 + ab4ebba
commit 563d541
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 47 deletions.
diff --git a/beagle/__init__.py b/beagle/__init__.py
@@ -1 +1 @@
-__version__ = "1.87.0"
+__version__ = "1.88.0"
diff --git a/runner/operator/access/heme/qc/input_template.json.jinja2 b/runner/operator/access/heme/qc/input_template.json.jinja2
@@ -10,15 +10,15 @@
     "samples-json": {{samples_json_content}},
     "multiqc_config": {
         "class": "File",
-        "location": "juno:///work/cch/production/resources/cmo-ch/versions/v1.0/multiqc_config/versions/v1.0/config_ch.yaml",
+        "location": "juno:///work/cch/production/resources/cmo-ch/versions/v1.0/multiqc_config/versions/v1.0/config_ch.yaml"
     },
     "biometrics_bed_file": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_probes_Y_only.bed",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_probes_Y_only.bed"
     },
     "biometrics_vcf_file": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-ACCESS-v1_0-TilingaAndFpSNPs_viral.vcf",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-ACCESS-v1_0-TilingaAndFpSNPs_viral.vcf"
     },
     "biometrics_json": true,
     "biometrics_plot": true,
@@ -27,37 +27,37 @@
     "hsmetrics_minimum_mapping_quality": 1,
     "noise_sites_bed": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_probe.bed",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_probe.bed"
     },
     "bait_intervals": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_probes_final_viral.interval_list",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_probes_final_viral.interval_list"
     },
     "target_intervals": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_targets_final_viral.interval_list",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/accessH_targets_final_viral.interval_list"
     },
     "reference": {
         "class": "File",
         "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta",
         "secondaryFiles": [
             {
                 "class": "File",
-                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta.fai",
+                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta.fai"
             },
             {
                 "class": "File",
-                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.dict",
-            },
-        ],
+                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.dict"
+            }
+        ]
     },
     "hotspots_maf": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/hotspot-list-union-v1-v2_with_TERT_with_aa.maf",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/hotspot-list-union-v1-v2_with_TERT_with_aa.maf"
     },
     "mosdepth_bed": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_canonicaltargets.bed",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_canonicaltargets.bed"
     },
     "sequence_qc_min_basq": 1,
     "sequence_qc_min_mapq": 1,
@@ -79,5 +79,5 @@
     "fragment_count": 1,
     "filter_duplicate": 0,
     "omaf": true,
-    "generic_counting": true,
+    "generic_counting": true
 }
diff --git a/runner/operator/access/v2_1_0/qc/input_template.json.jinja2 b/runner/operator/access/v2_1_0/qc/input_template.json.jinja2
@@ -10,15 +10,15 @@
     "samples-json": {{samples_json_content}},
     "multiqc_config": {
         "class": "File",
-        "location": "juno:///work/access/production/resources/msk-access/v2.0/multi_qc/v1.0/config_accessv2.yaml",
+        "location": "juno:///work/access/production/resources/msk-access/v2.0/multi_qc/v1.0/config_accessv2.yaml"
     },
     "biometrics_bed_file": {
         "class": "File",
-        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_probes_Y_only.bed",
+        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_probes_Y_only.bed"
     },
     "biometrics_vcf_file": {
         "class": "File",
-        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_0-TilingaAndFpSNPs.vcf",
+        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_0-TilingaAndFpSNPs.vcf"
     },
     "biometrics_json": true,
     "biometrics_plot": true,
@@ -27,37 +27,37 @@
     "hsmetrics_minimum_mapping_quality": 1,
     "noise_sites_bed": {
         "class": "File",
-        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_targetsAllwFP.bed",
+        "location": "juno:///work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_targetsAllwFP.bed"
     },
     "bait_intervals": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_probesAllwFP.interval_list",
+        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_probesAllwFP.interval_list"
     },
     "target_intervals": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_canonicaltargets.interval_list",
+        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/MSK-ACCESS-v2_canonicaltargets.interval_list"
     },
     "reference": {
         "class": "File",
         "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta",
         "secondaryFiles": [
             {
                 "class": "File",
-                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta.fai",
+                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.fasta.fai"
             },
             {
                 "class": "File",
-                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.dict",
-            },
-        ],
+                "location": "juno:///juno/work/access/production/resources/reference/versions/hg19_virus_special/hg19_virus.dict"
+            }
+        ]
     },
     "hotspots_maf": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/hotspot-list-union-v1-v2_with_TERT_with_aa.maf",
+        "location": "juno:///juno/work/access/production/resources/msk-access/v2.0/regions_of_interest/versions/v1.0/hotspot-list-union-v1-v2_with_TERT_with_aa.maf"
     },
     "mosdepth_bed": {
         "class": "File",
-        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_canonicaltargets.bed",
+        "location": "juno:///juno/work/access/production/resources/tools/resources/access-heme/region_of_interest/versions/v1.0/MSK-Heme-v1_0_canonicaltargets.bed"
     },
     "sequence_qc_min_basq": 1,
     "sequence_qc_min_mapq": 1,
@@ -79,5 +79,5 @@
     "fragment_count": 1,
     "filter_duplicate": 0,
     "omaf": true,
-    "generic_counting": true,
+    "generic_counting": true
 }
diff --git a/runner/operator/argos_bam_operator/v1_0_0/argos_bam_operator.py b/runner/operator/argos_bam_operator/v1_0_0/argos_bam_operator.py
@@ -24,7 +24,7 @@
 
 
 class ArgosBamOperator(Operator):
-    ARGOS_NAME = "argos"
+    ARGOS_NAME = "argosBam"
     ARGOS_VERSION = "1.6.1"
 
     def get_jobs(self):
@@ -118,15 +118,15 @@ def get_argos_jobs(self, argos_inputs):
             pipeline_id = self.get_pipeline_id()
             pipeline = Pipeline.objects.get(id=pipeline_id)
             argos_bam_job_data = {"app": pipeline_id, "inputs": job, "name": name, "tags": tags}
+            output_dir = os.path.join(pipeline.output_directory, "argosBam", get_project_prefix(self.request_id))
             if self.output_directory_prefix:
                 tags["output_directory_prefix"] = self.output_directory_prefix
-                if self.job_group_id:
-                    jg = JobGroup.objects.get(id=self.job_group_id)
-                    jg_created_date = jg.created_date.strftime("%Y%m%d_%H_%M_%f")
-                    output_directory = os.path.join(
-                        pipeline.output_directory, "argosBam", output_prefix, pipeline.version, jg_created_date
-                    )
-                    argos_bam_job_data["output_directory"] = output_directory
+                output_dir = os.path.join(pipeline.output_directory, "argosBam", output_prefix)
+            if self.job_group_id:
+                jg = JobGroup.objects.get(id=self.job_group_id)
+                jg_created_date = jg.created_date.strftime("%Y%m%d_%H_%M_%f")
+                output_directory = os.path.join(output_dir, pipeline.version, jg_created_date)
+                argos_bam_job_data["output_directory"] = output_directory
             argos_jobs.append(RunCreator(**argos_bam_job_data))
         return argos_jobs
 

diff --git a/runner/operator/chronos_operator/chronos_operator.py b/runner/operator/chronos_operator/chronos_operator.py
@@ -76,7 +76,7 @@ def get_jobs(self, pairing_override=None):
         igocomplete_query = Q(metadata__igoComplete=True)
         missing_fields_query = self.filter_out_missing_fields_query()
         q = recipe_query & assay_query & igocomplete_query & missing_fields_query
-        tempo_files = FileRepository.filter(queryset=FileRepository.all(), q=q, file_group=settings.IMPORT_FILE_GROUP)
+        tempo_files = FileRepository.filter(queryset=FileRepository.all(), q=q, file_group=self.file_group)
         tempo_files = FileRepository.filter(queryset=tempo_files, filter_redact=True)
 
         self.send_message(
@@ -154,7 +154,7 @@ def get_jobs(self, pairing_override=None):
                     settings.REQUEST_ID_METADATA_KEY: self.request_id,
                     settings.TUMOR_OR_NORMAL_METADATA_KEY: "Tumor",
                 },
-                file_group=settings.IMPORT_FILE_GROUP,
+                file_group=self.file_group,
                 values_metadata=settings.CMO_SAMPLE_TAG_METADATA_KEY,
             )
             used_normals = set()
@@ -168,7 +168,7 @@ def get_jobs(self, pairing_override=None):
                     mapping = self.get_mapping_for_pair(tumor, pairing["normal"], mapping_all, used_normals)
                     normal_request_id = FileRepository.filter(
                         metadata={settings.SAMPLE_ID_METADATA_KEY: pairing["normal"]},
-                        file_group=settings.IMPORT_FILE_GROUP,
+                        file_group=self.file_group,
                         values_metadata=settings.REQUEST_ID_METADATA_KEY,
                     )
                     used_normals_requests.add(normal_request_id)
@@ -243,22 +243,22 @@ def get_jobs(self, pairing_override=None):
                 continue
             patient_id = FileRepository.filter(
                 metadata={settings.CMO_SAMPLE_TAG_METADATA_KEY: sample},
-                file_group=settings.IMPORT_FILE_GROUP,
+                file_group=self.file_group,
                 values_metadata=settings.PATIENT_ID_METADATA_KEY,
             ).first()
             request_id = FileRepository.filter(
                 metadata={settings.CMO_SAMPLE_TAG_METADATA_KEY: sample},
-                file_group=settings.IMPORT_FILE_GROUP,
+                file_group=self.file_group,
                 values_metadata=settings.REQUEST_ID_METADATA_KEY,
             ).first()
             gene_panel = FileRepository.filter(
                 metadata={settings.CMO_SAMPLE_TAG_METADATA_KEY: sample},
-                file_group=settings.IMPORT_FILE_GROUP,
+                file_group=self.file_group,
                 values_metadata=settings.RECIPE_METADATA_KEY,
             ).first()
             primary_id = FileRepository.filter(
                 metadata={settings.CMO_SAMPLE_TAG_METADATA_KEY: sample},
-                file_group=settings.IMPORT_FILE_GROUP,
+                file_group=self.file_group,
                 values_metadata=settings.SAMPLE_ID_METADATA_KEY,
             ).first()
             job_tags = copy.deepcopy(tags)
@@ -404,7 +404,7 @@ def get_exclusions(self):
     def get_ci_tag(self, primary_id):
         return FileRepository.filter(
             metadata={settings.SAMPLE_ID_METADATA_KEY: primary_id},
-            file_group=settings.IMPORT_FILE_GROUP,
+            file_group=self.file_group,
             values_metadata=settings.CMO_SAMPLE_TAG_METADATA_KEY,
         ).first()
 

diff --git a/runner/operator/operator.py b/runner/operator/operator.py
@@ -33,10 +33,9 @@ def __init__(
         self.job_group_notifier_id = job_group_notifier_id
         self.run_ids = run_ids
         self.file_group = file_group
-        if self.file_group:
-            self.files = FileRepository.filter(file_group=self.file_group).all()
-        else:
-            self.files = FileRepository.filter(file_group=settings.IMPORT_FILE_GROUP).all()
+        if not self.file_group:
+            self.file_group = settings.IMPORT_FILE_GROUP
+        self.files = FileRepository.filter(file_group=self.file_group).all()
         self.pairing = pairing
         # {"pairs": [{"tumor": "tumorSampleName", "normal": "normalSampleName"}]}
         self.output_directory_prefix = output_directory_prefix