phc-ingestion 0.10.9__py3-none-any.whl → 0.10.10__py3-none-any.whl

ingestion/nebula/manifest_assembler.py

@@ -37,7 +37,7 @@ class Patient(Resource):
     gender: str | None
     birthDate: str | None
     managingOrganization: Reference | None
-    generalPractitioner: Reference | None
+    generalPractitioner: list[Reference] | None
 
 
 class Organization(Resource):
@@ -103,22 +103,11 @@ class ManifestAssembler:
         identifiers = resource.get("identifier", [])
         return identifiers[0].get("value", "") if identifiers else ""
 
-    def __extract_id_from_reference(self, reference: Reference | None) -> str:
-        if not reference:
-            return ""
-
-        ref_string = reference.get("reference")
-        if not ref_string:
-            return ""
-
+    def __extract_id_from_reference(self, reference: Reference) -> str:
+        ref_string = reference.get("reference", "")
         parts = ref_string.split("/")
         return parts[1] if len(parts) > 1 else parts[0]
 
-    def __extract_id_from_reference_list(self, references: list[Reference] | None) -> str:
-        if not references or len(references) == 0:
-            return ""
-        return self.__extract_id_from_reference(references[0])
-
     def __extract_elation_mrn(self, patient: Patient) -> str:
         identifier = next(
             (
@@ -166,14 +155,9 @@ class ManifestAssembler:
             "Organization", patient.get("managingOrganization")
         )
 
-        # Handle generalPractitioner as a list
-        general_practitioner: Practitioner | None = None
-        general_practitioner_refs: list[Reference] = patient.get("generalPractitioner", [])
-        if general_practitioner_refs:
-            general_practitioner = self.__fetch_resource_by_type_and_reference(
-                "Practitioner",
-                {"reference": self.__extract_id_from_reference_list(general_practitioner_refs)},
-            )
+        general_practitioner: Practitioner | None = self.__fetch_resource_by_type_and_reference(
+            "Practitioner", next(iter(patient.get("generalPractitioner", [])), None)
+        )
 
         patient_info = self.__parse_human_name(patient.get("name"))
         practitioner_info = self.__parse_human_name(

{phc_ingestion-0.10.9.dist-info → phc_ingestion-0.10.10.dist-info}/METADATA

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

{phc_ingestion-0.10.9.dist-info → phc_ingestion-0.10.10.dist-info}/RECORD

@@ -28,7 +28,7 @@ ingestion/generic/process.py,sha256=ZaVnZ_gx9faDUsuresI1A0oCegTa-dPQT7DBFMeZGyY,
 ingestion/generic/utils.py,sha256=1MEIru7uq38IjUdL8lcHqDH0oTki9uWrz1f2e-pmRoU,2814
 ingestion/nebula/__init__.py,sha256=VauK-rup_N8ZXVohx3HYqHX_PE_WoPyMUhdv2R7al4o,45
 ingestion/nebula/constants.py,sha256=thKqSwemdaAwAmKvF4FEVI9l1Ph5ergsnMlx6nWte7E,357
-ingestion/nebula/manifest_assembler.py,sha256=NaFxmWYiIUXOabP8TTaH3JkvwELVB7Z-TUMN4j_MoaM,6972
+ingestion/nebula/manifest_assembler.py,sha256=Og1g_HD0cR9osH5eWdttgFEEayimaZRO7QckC9U9YKM,6383
 ingestion/nebula/process.py,sha256=NhlaMl6q2nTocWZvTUVMKaq1IghiZKyqSjnWApchnAU,2331
 ingestion/nextgen/__init__.py,sha256=7LQ-h_Bvc5P1QcHMdzsqi1Qm4fTJn04-ozar2ty9wSc,59
 ingestion/nextgen/process.py,sha256=5Z0RfclwTAYZruGDiLPutjPCYFh1DJpoWY9dnttghT4,3993
@@ -59,6 +59,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-0.10.9.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-phc_ingestion-0.10.9.dist-info/METADATA,sha256=5qVLQFXYsuhBOyl6rtGdZ-_YHSCBeX1Zyut3QiMJnI4,677
-phc_ingestion-0.10.9.dist-info/RECORD,,
+phc_ingestion-0.10.10.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+phc_ingestion-0.10.10.dist-info/METADATA,sha256=8wvmYqBCNwJ4ODMbdwnUQtC2KOdu7QbxmRj7LWapzXk,678
+phc_ingestion-0.10.10.dist-info/RECORD,,