phc-ingestion 0.10.17__tar.gz → 0.10.19__tar.gz

{phc-ingestion-0.10.17 → phc-ingestion-0.10.19}/PKG-INFO

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

{phc-ingestion-0.10.17 → phc-ingestion-0.10.19}/ingestion/foundation/util/ga4gh.py

@@ -111,17 +111,23 @@ def get_hrd_status(genes) -> Optional[str]:
     hrd_dict = {
         "HRD Positive": "positive",
         "HRD Not Detected": "negative",
+        "HRDsig Positive": "positive",
+        "HRDsig Not Detected": "negative",
+        "HRDsig Negative": "negative",
     }
-    hrd_entry = [
-        entry
-        for entry in genes.get("Gene", {})
-        if entry.get("Name", "") == "Homologous Recombination status"
-    ]
-    if hrd_entry:
-        hrd_val = hrd_entry[0].get("Alterations", "").get("Alteration", "").get("Name", "")
-        return [value for (key, value) in hrd_dict.items() if key == hrd_val][0]
-    else:
+    hrd_entry = next(
+        (
+            entry
+            for entry in genes.get("Gene", {})
+            if entry.get("Name", "") == "Homologous Recombination status"
+            or entry.get("Name", "") == "HRD signature"
+        ),
+        None,
+    )
+    if not hrd_entry:
         return None
+    hrd_val = hrd_entry.get("Alterations", {}).get("Alteration", {}).get("Name", "")
+    return hrd_dict.get(hrd_val, None)
 
 
 def get_test_yml(
@@ -155,6 +161,14 @@ def get_test_yml(
         (prop for prop in properties if prop.get("@key") == "ComprehensiveTumorFractionScore"),
         {},
     ).get("value")
+    hrd_score = next(
+        (
+            prop
+            for prop in properties
+            if prop.get("@key") == "HomologousRecombinationDeficiencyScore"
+        ),
+        {},
+    ).get("value")
     plasma_tumor_fraction_score = None
     if plasma_tumor_fraction_score_value:
         plasma_tumor_fraction_score = get_plasma_tumor_fraction_score_from_value(
@@ -325,5 +339,7 @@ def get_test_yml(
     # add homologous recombination deficiency
     if hrd_status:
         yaml_file["hrdStatus"] = hrd_status
+    if hrd_score != None and is_number(hrd_score):
+        yaml_file["hrdScore"] = float(hrd_score)
 
     return yaml_file

phc-ingestion-0.10.19/ingestion/shared_util/fetch_patient.py

@@ -0,0 +1,76 @@
+from typing import Any
+from lifeomic_logging import scoped_logger
+from ingestion.shared_util.lambda_client import LambdaClient
+
+# Constants
+DATASET_SYSTEM = "http://lifeomic.com/fhir/dataset"
+
+
+def fetch_patient(
+    *,
+    elation_id: str,
+    given_name: str,
+    birthdate: str,
+    project_id: str,
+    account_id: str,
+    ingestion_id: str,
+) -> dict[str, Any] | None:
+    """
+    Fetch a patient from the patient-service lambda using Elation ID AND given name AND
+    birthdate.
+
+    Returns:
+        The patient resource if found, None otherwise
+
+    Raises:
+        RuntimeError: When multiple patients are found (ambiguous match)
+    """
+    log_context = {
+        "accountId": account_id,
+        "projectId": project_id,
+        "elationId": elation_id,
+        "ingestionId": ingestion_id,
+    }
+
+    with scoped_logger(__name__, log_context) as log:
+        # Create LambdaClient instance with proper headers
+        client = LambdaClient(
+            "patient-service",
+            {
+                "Content-Type": "application/json",
+                "LifeOmic-Account": account_id,
+                "LifeOmic-Correlation-Id": ingestion_id,
+            },
+        )
+
+        # Search by Elation ID AND given name AND birthdate
+        log.info(
+            f"Searching for patient with Elation ID: {elation_id}, given name: {given_name}, birthdate: {birthdate}"
+        )
+        response = client.invoke(
+            f"/{account_id}/dstu3/Patient",
+            "get",
+            None,
+            {
+                "_tag": f"{DATASET_SYSTEM}|{project_id}",
+                "identifier": elation_id,
+                "name": given_name,
+                "birthdate": birthdate,
+            },
+        )
+        entries = response.get("entry", [])
+
+        if len(entries) == 0:
+            error_msg = f"No patient found with Elation ID: {elation_id}, given name: {given_name}, birthdate: {birthdate}"
+            log.error(error_msg)
+            raise RuntimeError(error_msg)
+
+        if len(entries) > 1:
+            error_msg = f"Found multiple patients when one was expected. Found {len(entries)}. Elation ID {elation_id}, given name {given_name}, birthdate {birthdate}."
+            log.error(error_msg)
+            raise RuntimeError(error_msg)
+
+        log.info(
+            f"Found patient with Elation ID: {elation_id}, given name: {given_name}, birthdate: {birthdate}"
+        )
+        return entries[0]["resource"]

{phc-ingestion-0.10.17 → phc-ingestion-0.10.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phc-ingestion"
-version = "0.10.17"
+version = "0.10.19"
 description = "Functions for LifeOmic PHC genomic ingestions"
 authors = [
     { name = "LifeOmic Development", email = "development@lifeomic.com" },