Skip to content

Commit d89c3e8

Browse files
committed
add check for no crams provided and add bp for rp buckets
1 parent 48c93f7 commit d89c3e8

9 files changed

+21
-13
lines changed

pipelines/wdl/glimpse/low_pass_imputation/input_qc/Glimpse2LowPassImputationQC.wdl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ task ValidateCramsAndIndicesAndSampleIds {
201201
num_cram_indices = len(cram_indices)
202202
num_sample_ids = len(sample_ids)
203203
204-
max_cram_file_size_gb = ~{max_cram_file_size_gb}
205-
billing_project = "~{billing_project_for_rp}"
204+
if num_crams == 0:
205+
qc_messages.append("No CRAM files provided.")
206206
207207
# Validate that the number of CRAMs, CRAIs, and sample IDs match
208208
if num_crams != num_cram_indices or num_crams != num_sample_ids:
@@ -240,14 +240,13 @@ task ValidateCramsAndIndicesAndSampleIds {
240240
print("CRAM paths are unique.")
241241
242242
# Ensure that all CRAM files are less than the maximum file size allowed
243+
max_cram_file_size_gb = ~{max_cram_file_size_gb}
244+
billing_project = "~{billing_project_for_rp}"
243245
crams_exceeding_max_size = []
244246
245-
# Create storage client
246247
client = storage.Client(project=billing_project) if billing_project else storage.Client()
247-
248248
for cram in crams:
249249
try:
250-
# Parse GCS path: gs://bucket-name/path/to/file.cram
251250
if cram.startswith('gs://'):
252251
blob = storage.Blob.from_uri(cram, client=client)
253252
@@ -257,6 +256,7 @@ task ValidateCramsAndIndicesAndSampleIds {
257256
# Get file size
258257
file_size_bytes = blob.size
259258
file_size_gb = file_size_bytes // (1024 ** 3)
259+
print(f" - File size for {cram}: {file_size_gb} GB")
260260
261261
if file_size_gb > max_cram_file_size_gb:
262262
crams_exceeding_max_size.append(f"{cram} ({file_size_gb}GB)")

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_cram_duplicate_cram_paths.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram"],
99
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai"],
10-
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample1"]
10+
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample1"],
11+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1112
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_cram_duplicate_sample_ids_and_duplicate_cram_paths.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram"],
99
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram.crai"],
10-
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample0", "sample1", "sample1"]
10+
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample0", "sample1", "sample1"],
11+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1112
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_cram_mismatched_array_lengths.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram"],
99
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram.crai"],
10-
"Glimpse2LowPassImputationQC.sample_ids": ["sample0"]
10+
"Glimpse2LowPassImputationQC.sample_ids": ["sample0"],
11+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1112
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_cram_no_crai.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"Glimpse2LowPassImputationQC.output_basename": "plumbing_test_fail_cram_without_crai",
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fake-bucket/fake-file1.cram", "gs://fake-bucket/fake-file2.cram"],
9-
"Glimpse2LowPassImputationQC.sample_ids": ["sample1", "sample2"]
9+
"Glimpse2LowPassImputationQC.sample_ids": ["sample1", "sample2"],
10+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1011
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_cram_no_sample_ids.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"Glimpse2LowPassImputationQC.output_basename": "plumbing_test_fail_cram_without_sample_ids",
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fake-bucket/fake-file1.cram", "gs://fake-bucket/fake-file2.cram"],
9-
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fake-bucket/fake-file1.crai", "gs://fake-bucket/fake-file2.crai"]
9+
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fake-bucket/fake-file1.crai", "gs://fake-bucket/fake-file2.crai"],
10+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1011
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/fail_manifest_duplicate_sample_ids.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"Glimpse2LowPassImputationQC.fasta_index": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.fasta.fai",
66
"Glimpse2LowPassImputationQC.output_basename": "plumbing_test",
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
8-
"Glimpse2LowPassImputationQC.cram_manifest": "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCramManifestDuplicateSamples.tsv"
8+
"Glimpse2LowPassImputationQC.cram_manifest": "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCramManifestDuplicateSamples.tsv",
9+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
910
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/pass_cram.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
88
"Glimpse2LowPassImputationQC.crams": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram"],
99
"Glimpse2LowPassImputationQC.cram_indices": ["gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram0.cram.crai", "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCram1.cram.crai"],
10-
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample1"]
10+
"Glimpse2LowPassImputationQC.sample_ids": ["sample0", "sample1"],
11+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
1112
}

pipelines/wdl/glimpse/low_pass_imputation/input_qc/test_inputs/Plumbing/pass_manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"Glimpse2LowPassImputationQC.fasta_index": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.fasta.fai",
66
"Glimpse2LowPassImputationQC.output_basename": "plumbing_test",
77
"Glimpse2LowPassImputationQC.ref_dict": "gs://gcp-public-data--broad-references/hg38/v0/Homo_sapiens_assembly38.dict",
8-
"Glimpse2LowPassImputationQC.cram_manifest": "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCramManifest.tsv"
8+
"Glimpse2LowPassImputationQC.cram_manifest": "gs://fc-cddd72b5-323c-495c-9557-5057fff0275a/morgan_test/fakeCramManifest.tsv",
9+
"Glimpse2LowPassImputationQC.billing_project_for_rp": "terra-f8e3de20"
910
}

0 commit comments

Comments
 (0)