phc-ingestion 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

ingestion/broad/process.py

@@ -0,0 +1,50 @@
+import os
+
+from ingestion.vcf_standardization.standardize import standardize_vcf
+from ingestion.broad.utils import check_manifest
+from lifeomic_logging import scoped_logger
+
+
+def process(
+    manifest_file: str, vcf_file: str, source_file_id: str, out_path: str, case_id: str
+) -> dict[str, str]:
+    with scoped_logger(__name__) as log:
+
+        # Read in supplied manifest
+        manifest = check_manifest(manifest_file, case_id, log)
+
+        # Process VCF
+        base_vcf_file = os.path.basename(vcf_file)
+        vcf_out = base_vcf_file.replace(".vcf", ".modified.vcf")
+        vcf_final = base_vcf_file.replace(".vcf", ".modified.nrm.filtered.vcf")
+        if not vcf_final.endswith(".gz"):
+            vcf_final = vcf_final + ".gz"
+        # All broad VCF ingestions are germline, so ensure the
+        # sample name is prefixed with "germline_". This matches
+        # the downstream logic in genomic-manifest
+        sample_name = f"germline_{case_id}"
+        vcf_line_count = standardize_vcf(
+            vcf_file, vcf_out, out_path, sample_name, log, compression=True
+        )
+
+        # Add to manifest
+        manifest["sourceFileId"] = source_file_id
+        manifest["resources"] = [
+            {"fileName": f".lifeomic/broad_filtered/{case_id}/{base_vcf_file}"}
+        ]
+        manifest["files"] = [
+            {
+                "fileName": f".lifeomic/broad_filtered/{case_id}/{vcf_final}",
+                "sequenceType": "germline",
+                "type": "shortVariant",
+            }
+        ]
+
+        case_metadata = {
+            "test_type": manifest["testType"],
+            "vcf_line_count": vcf_line_count,
+            "case_id": manifest["reportID"],
+            "germline_genome_reference": manifest["reference"],
+        }
+
+        return case_metadata, manifest

ingestion/broad/utils.py

@@ -0,0 +1,82 @@
+import os
+from logging import Logger
+from schema import Schema, SchemaError, Optional
+from ruamel.yaml import YAML
+
+
+def check_manifest(manifest_file_path: str, case_id, log: Logger):
+    manifest_schema = Schema(
+        {
+            # Required fields
+            "name": str,  # Vendor name
+            "testType": str,  # Vendor test name
+            "indexedDate": str,  # Date of ingestion YYYY-MM-DD
+            "reference": str,  # Reference genome
+            "mrn": str,  # Patient MRN
+            "patientInfo": {
+                "lastName": str,
+                "dob": str,  # YYYY-MM-DD
+                "firstName": str,
+                "gender": str,
+            },
+            # Optional fields
+            Optional("receivedDate"): str,
+            Optional("collDate"): str,
+            Optional("reportDate"): str,
+            Optional("reportFile"): str,
+            Optional("medFacilName"): str,
+            Optional("medFacilID"): str,
+            Optional("orderingMDName"): str,
+            Optional("orderingMDNPI"): str,
+            Optional("indicationSystem"): "http://lifeomic.com/fhir/sequence-indication",
+            Optional("indication"): str,
+            Optional("indicationDisplay"): str,
+            Optional("bodySite"): str,
+            Optional("bodySiteDisplay"): str,
+            Optional("bodySiteSystem"): "http://lifeomic.com/fhir/sequence-body-site",
+            Optional("tmb"): str,
+            Optional("tmbScore"): float,
+            Optional("msi"): str,
+            Optional("lossOfHeterozygosityScore"): int,
+            Optional("lossOfHeterozygosityStatus"): str,
+            Optional("ihcTests"): any,
+            Optional("nonHumanContent"): any,
+            Optional("plasmaTumorFraction"): str,
+            Optional("cellPurity"): float,
+            Optional("hrdStatus"): str,
+            Optional("sampleId"): str,
+        }
+    )
+
+    # Read in manifest yaml
+    if os.path.exists(manifest_file_path):
+        with open(manifest_file_path, "r") as file:
+            manifest = YAML(typ="safe")
+            manifest = manifest.load(file)
+    else:
+        raise FileNotFoundError(f"Manifest file not found: {manifest_file_path}")
+
+    # Validate
+    try:
+        manifest_schema.validate(manifest)
+    except SchemaError as e:
+        log.error(e)
+        raise e
+
+    # Add duplicate fields from supplied ones to fit formatting
+    manifest["patientInfo"]["identifiers"] = [
+        {
+            "codingCode": "MR",
+            "codingSystem": "http://hl7.org/fhir/v2/0203",
+            "value": manifest["mrn"],
+        }
+    ]
+
+    manifest["patientLastName"] = manifest["patientInfo"]["lastName"]
+
+    manifest["patientDOB"] = manifest["patientInfo"]["dob"]
+
+    manifest["reportID"] = case_id  # Vendor report ID / Case ID
+
+    log.info(f"Manifest file validated")
+    return manifest

ingestion/nextgen/util/manifest_helpers.py

@@ -25,7 +25,9 @@ def parse_patient_name(line: str) -> str:
 
 
 def parse_sample_number(line: str) -> str:
-    return parse_pattern(r"^.*Specimen #: (\d*-?R?) .*$", line, "sample number")
+    return parse_pattern(
+        r"^.*Specimen #: (\d+(?:-[A-Za-z0-9]+)?(?:-?R)?) .*$", line, "sample number"
+    )
 
 
 def parse_body_site(line: str) -> str:

{phc_ingestion-1.0.2.dist-info → phc_ingestion-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phc-ingestion
-Version: 1.0.2
+Version: 1.0.4
 Summary: Functions for LifeOmic PHC genomic ingestions
 License: MIT
 Author-email: LifeOmic Development <development@lifeomic.com>

{phc_ingestion-1.0.2.dist-info → phc_ingestion-1.0.4.dist-info}/RECORD

@@ -1,4 +1,7 @@
 ingestion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ingestion/broad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ingestion/broad/process.py,sha256=IrtnANQlbPpI7aza-N_v8qMyxBOX17jq904wDNq7Nng,1803
+ingestion/broad/utils.py,sha256=YHzbmB0tP-aQjvY9vRSn8iOhailleYwvctDbB0IEKb8,2853
 ingestion/caris/__init__.py,sha256=sFHl6qZWaacTbCFyikkIkuC-z459m5XQ7kwwoCw7HK8,61
 ingestion/caris/process.py,sha256=7GaSTg9LjqSn7iTNbY3FJIPFvVjkd6wgXiVC00pn-7A,1411
 ingestion/caris/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,7 +37,7 @@ ingestion/nextgen/__init__.py,sha256=7LQ-h_Bvc5P1QcHMdzsqi1Qm4fTJn04-ozar2ty9wSc
 ingestion/nextgen/process.py,sha256=5Z0RfclwTAYZruGDiLPutjPCYFh1DJpoWY9dnttghT4,3993
 ingestion/nextgen/util/alteration_table.py,sha256=JTWBL1Fqj_pGsH5vwuVEnCUJle2wOBk6VYImHYCF9vg,6129
 ingestion/nextgen/util/interpretation.py,sha256=a_B8jVjJXjkrN0hNzB260WNlZdY-BkL26LyLZcYP20A,950
-ingestion/nextgen/util/manifest_helpers.py,sha256=zucNhbSss6IuU-kf3tpVoSxV27iSNQohGSMUXQQePSc,2729
+ingestion/nextgen/util/manifest_helpers.py,sha256=Eo89CBRDrMGLIq2OBkKS9lH5yL4pgMUOysle1TL9qr8,2765
 ingestion/nextgen/util/nextgen_specific_genes.py,sha256=1jFcqvtYAlJ7eBwOBm1UC2TzAbjHjdlvPBUzxr1G8dY,1206
 ingestion/nextgen/util/pre_filter_somatic_vcf.py,sha256=mIaUihmGLbS38D4Gy_Qtf1lFAfW0A-LgAgQmsrEiI-M,3529
 ingestion/nextgen/util/process_cnv.py,sha256=MIirc8e0k6lsaTZkRM3U3L3IvbrcHmKQ4xlIu585514,2430
@@ -60,6 +63,6 @@ ingestion/vcf_standardization/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 ingestion/vcf_standardization/util/af_helpers.py,sha256=dpTzoeIQVeBRt0ETF3a9rp5ojZqznHg4x_hCZ8OPcOg,1061
 ingestion/vcf_standardization/util/dp_helpers.py,sha256=Nq8oLOLObu4_pv16qwwgpALRlUoJVCULrd9cFOD-eoI,823
 ingestion/vcf_standardization/util/read_write.py,sha256=x3Pf6Dq8tmolblbCS5CrNmrcHS3FGfqBSFpFgvFGC4g,2526
-phc_ingestion-1.0.2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-phc_ingestion-1.0.2.dist-info/METADATA,sha256=PrNukFYVStjbSRrBD7OjQTv0ZVOIZMwbQ2LDgWP6lNM,676
-phc_ingestion-1.0.2.dist-info/RECORD,,
+phc_ingestion-1.0.4.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+phc_ingestion-1.0.4.dist-info/METADATA,sha256=_pBhlXnkSblAR6gqgXmPMq7FjvAZY_1y55rfdpB9rVQ,676
+phc_ingestion-1.0.4.dist-info/RECORD,,