helix.fhir.client.sdk 4.2.24__py3-none-any.whl → 4.2.26__py3-none-any.whl

helix_fhir_client_sdk/graph/simulated_graph_processor_mixin.py

@@ -81,6 +81,7 @@ class SimulatedGraphProcessorMixin(ABC, FhirClientProtocol):
         add_cached_bundles_to_result: bool = True,
         input_cache: RequestCache | None = None,
         compare_hash: bool = True,
+        append_without_duplicate_removal: bool = False,
     ) -> AsyncGenerator[FhirGetResponse, None]:
         """
         Asynchronously simulate a FHIR $graph query with advanced processing capabilities.
@@ -237,7 +238,13 @@ class SimulatedGraphProcessorMixin(ABC, FhirClientProtocol):
 
             start_time = time.time()
             # Combine and process responses
-            parent_response = cast(FhirGetBundleResponse, parent_response.extend(child_responses))
+            if not append_without_duplicate_removal:
+                parent_response = cast(FhirGetBundleResponse, parent_response.extend(child_responses))
+            else:
+                parent_response = cast(
+                    FhirGetBundleResponse,
+                    parent_response._append_without_duplicate_removal(child_responses),
+                )
             if logger:
                 logger.info(f"Parent_response.extend time: {time.time() - start_time}")
 
@@ -1154,6 +1161,7 @@ class SimulatedGraphProcessorMixin(ABC, FhirClientProtocol):
         add_cached_bundles_to_result: bool = True,
         input_cache: RequestCache | None = None,
         compare_hash: bool = True,
+        append_without_duplicate_removal: bool = False,
     ) -> FhirGetResponse:
         """
         Simulates the $graph query on the FHIR server
@@ -1206,6 +1214,7 @@ class SimulatedGraphProcessorMixin(ABC, FhirClientProtocol):
                 add_cached_bundles_to_result=add_cached_bundles_to_result,
                 input_cache=input_cache,
                 compare_hash=compare_hash,
+                append_without_duplicate_removal=append_without_duplicate_removal,
             )
         )
         assert result, "No result returned from simulate_graph_async"

helix_fhir_client_sdk/responses/fhir_get_response.py

@@ -125,6 +125,15 @@ class FhirGetResponse:
     @abstractmethod
     def _append(self, other_response: "FhirGetResponse") -> "FhirGetResponse": ...
 
+    def _append_without_duplicate_removal(self, others: list["FhirGetResponse"]) -> "FhirGetResponse":
+        """
+        Append the responses from others to self without duplicate removal.
+
+        :param others: list of FhirGetResponse objects to append to current one
+        :return: self
+        """
+        return self._extend(others=others)
+
     def append(self, other_response: "FhirGetResponse") -> "FhirGetResponse":
         """
         Append the responses from other to self

helix_fhir_client_sdk/responses/get/fhir_get_bundle_response.py

@@ -115,13 +115,32 @@ class FhirGetBundleResponse(FhirGetResponse):
         """
         other_response_entries: FhirBundleEntryList = other_response.get_bundle_entries()
 
-        if len(other_response_entries) > 0:
+        if len(other_response_entries):
             # only append if there are entries in the other response
             if self._bundle_entries is None:
-                self._bundle_entries = FhirBundleEntryList()
-            from collections import deque
+                self._bundle_entries = other_response_entries
+            else:
+                self._bundle_entries.extend(other_response_entries)
+
+        return self
+
+    def _append_without_duplicate_removal(self, others: list["FhirGetResponse"]) -> "FhirGetResponse":
+        """
+        Append the responses from other to self without duplicate removal
 
-            deque.extend(self._bundle_entries, other_response_entries)
+        :param others: list of FhirGetResponse objects to append to current one
+        :return: self
+        """
+        if self._bundle_entries is None:
+            self._bundle_entries = FhirBundleEntryList()
+
+        from collections import deque
+
+        for other_response in others:
+            other_response_entries: FhirBundleEntryList = other_response.get_bundle_entries()
+            if len(other_response_entries) > 0:
+                # only append if there are entries in the other response
+                deque.extend(self._bundle_entries, other_response_entries)
 
         return self
 

helix_fhir_client_sdk/responses/get/test/test_get_bundle_response.py

@@ -73,7 +73,7 @@ class TestFhirGetBundleResponse:
         assert response._bundle_metadata.id_ == "test-bundle-id"
         assert response._bundle_metadata.type_ == "searchset"
 
-    def test_append(self, sample_bundle_response: dict[str, Any]) -> None:
+    def test_append_unique(self, sample_bundle_response: dict[str, Any]) -> None:
         """Test appending another response."""
         results_by_url: list[RetryableAioHttpUrlResult] = []
 
@@ -113,8 +113,7 @@ class TestFhirGetBundleResponse:
 
         first_response.append(second_response)
 
-        # Updating it to 4 since we have integrated cache and do not do same lookups again so we do not need to remove duplicates here.
-        assert len(first_response.get_bundle_entries()) == 4
+        assert len(first_response.get_bundle_entries()) == 2
 
     def test_get_resources(self, sample_bundle_response: dict[str, Any]) -> None:
         """Test getting resources from the response."""

{helix_fhir_client_sdk-4.2.24.dist-info → helix_fhir_client_sdk-4.2.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: helix.fhir.client.sdk
-Version: 4.2.24
+Version: 4.2.26
 Summary: helix.fhir.client.sdk
 Home-page: https://github.com/icanbwell/helix.fhir.client.sdk
 Author: Imran Qureshi

{helix_fhir_client_sdk-4.2.24.dist-info → helix_fhir_client_sdk-4.2.26.dist-info}/RECORD

@@ -32,7 +32,7 @@ helix_fhir_client_sdk/graph/fhir_graph_mixin.py,sha256=z0j9FmO2bOnmzgQmczfkWC70u
 helix_fhir_client_sdk/graph/graph_definition.py,sha256=FTa1GLjJ6oooAhNw7SPk-Y8duB-5WtJtnwADao-afaI,3878
 helix_fhir_client_sdk/graph/graph_link_parameters.py,sha256=3rknHL6SBgpT2A1fr-AikEFrR_9nIJUotZ82XFzROLo,599
 helix_fhir_client_sdk/graph/graph_target_parameters.py,sha256=fdYQpPZxDnyWyevuwDwxeTXOJoE2PgS5QhPaXpwtFcU,705
-helix_fhir_client_sdk/graph/simulated_graph_processor_mixin.py,sha256=vNoiTL3wgo9slfwn-a8YsIeiwZIxVWVBaCQ-Ne1_4Gk,60460
+helix_fhir_client_sdk/graph/simulated_graph_processor_mixin.py,sha256=qPzjqGS7q2nj6HZIQoMJoMNIEXVD21-b6cmkC5FI31U,60919
 helix_fhir_client_sdk/graph/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 helix_fhir_client_sdk/graph/test/test_graph_mixin.py,sha256=LNd4LVjryVLgzWeTXMDpsbdauXl7u3LMfj9irnNfb_k,5469
 helix_fhir_client_sdk/graph/test/test_simulate_graph_processor_mixin.py,sha256=EQDfhqJfUrP6SptXRP7ayEN7g5cZQMA00ccXzeXiSXM,46312
@@ -46,7 +46,7 @@ helix_fhir_client_sdk/responses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 helix_fhir_client_sdk/responses/bundle_expander.py,sha256=ilR5eMgciSgzsdQvKB6bHtn9jtpvn3uS-EBz-hrahzo,1065
 helix_fhir_client_sdk/responses/fhir_client_protocol.py,sha256=IWM7LNQ1ZbgaySLGqpCwWAKyArT5HgBdNhkmSEivNMo,7100
 helix_fhir_client_sdk/responses/fhir_delete_response.py,sha256=0K11vyfZ0LtL-G61NHzDqHrZgEHjMVZr00VWpWcktZA,2941
-helix_fhir_client_sdk/responses/fhir_get_response.py,sha256=v0ndKFb6o8PNqYYxGlLETzQnxGmwK3YympH4gotXpY4,17550
+helix_fhir_client_sdk/responses/fhir_get_response.py,sha256=5WoI8AFQ4h54RvOFcorpaBQk1JlqGnZPnAGxZcsmvp0,17900
 helix_fhir_client_sdk/responses/fhir_merge_response.py,sha256=uvUjEGJgMDlAkcc5_LjgAsTFZqREQMlV79sbxUZwtwE,2862
 helix_fhir_client_sdk/responses/fhir_response_processor.py,sha256=fOSvqWjVI1BA6aDxxu9aqEvcKxtnFRmU2hMrgtmUCUM,34056
 helix_fhir_client_sdk/responses/fhir_update_response.py,sha256=_6zZz85KQP69WFxejlX8BBWAKWtzsMGSJjR_zqhl_m4,2727
@@ -54,14 +54,14 @@ helix_fhir_client_sdk/responses/get_result.py,sha256=hkbZeu9h-01ZZckAuckn6UDR9GX
 helix_fhir_client_sdk/responses/paging_result.py,sha256=tpmfdgrtaAmmViVxlw-EBHoe0PVjSQW9zicwRmhUVpI,1360
 helix_fhir_client_sdk/responses/resource_separator.py,sha256=jugaEkJYunx8VGVFCLwWNSjrBlI8DDm61LzSx9oR8iE,3230
 helix_fhir_client_sdk/responses/get/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-helix_fhir_client_sdk/responses/get/fhir_get_bundle_response.py,sha256=ryNaHVBZOxsf3uKMhKrFIUCnpmC8h_X7d3-0mzwoqhQ,18659
+helix_fhir_client_sdk/responses/get/fhir_get_bundle_response.py,sha256=Xw3yl8Du0nI1hrmZTi7vqPsm8Iu-oby3mnAAgd6pOYw,19420
 helix_fhir_client_sdk/responses/get/fhir_get_error_response.py,sha256=oNdKs_r7K4qRHD7fyeDhZz3v0wGTT2esAPPtDhxOyeI,12325
 helix_fhir_client_sdk/responses/get/fhir_get_list_by_resource_type_response.py,sha256=ssfb1IB2QTvqwWRzFs_VqPKH6mwcnWNo3iVh82M-Jso,13775
 helix_fhir_client_sdk/responses/get/fhir_get_list_response.py,sha256=KT5g6MjB9yWWUaSZpx1jK9Tm2yVmcFyZMHBBnDDAPtU,11858
 helix_fhir_client_sdk/responses/get/fhir_get_response_factory.py,sha256=OrizzAVoXvxnQbBxszeS9PUtbzg97RGNEJfD4PuOLig,6815
 helix_fhir_client_sdk/responses/get/fhir_get_single_response.py,sha256=pLjjDyxBvA_FNI7sGU2hM9urue3Bzrrwo_RcrOD5yz8,9755
 helix_fhir_client_sdk/responses/get/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-helix_fhir_client_sdk/responses/get/test/test_get_bundle_response.py,sha256=DF4sjy074jiro8jASavd-2hMkjIR6sIdIytzhIyBRuU,19674
+helix_fhir_client_sdk/responses/get/test/test_get_bundle_response.py,sha256=k66eMtb0e4QcWYeF_M3TUrwCXQgD5EOcpUaijzg7a2I,19545
 helix_fhir_client_sdk/responses/get/test/test_get_error_response.py,sha256=8P4zGgeHe-6OaSX152ixFW4W0iG2scK89O0VY_YcxuY,7613
 helix_fhir_client_sdk/responses/get/test/test_get_list_by_resource_type_response.py,sha256=eIZlhTYg5Iqh0vTmVAlesenQDyT8eCmFs1U4JngIM8w,12942
 helix_fhir_client_sdk/responses/get/test/test_get_list_response.py,sha256=vOsdgqSd5TwwgbwEX_kYvDyOnqAaKBKGAZFr4EZpGDM,14428
@@ -130,7 +130,7 @@ helix_fhir_client_sdk/validators/async_fhir_validator.py,sha256=i1BC98hZF6JhMQQz
 helix_fhir_client_sdk/validators/fhir_validator.py,sha256=HWBldSEB9yeKIcnLcV8R-LoTzwT_OMu8SchtUUBKzys,2331
 helix_fhir_client_sdk/validators/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 helix_fhir_client_sdk/validators/test/test_async_fhir_validator.py,sha256=RmSowjPUdZee5nYuYujghxWyqJ20cu7U0lJFtFT-ZBs,3285
-helix_fhir_client_sdk-4.2.24.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+helix_fhir_client_sdk-4.2.26.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/logger_for_test.py,sha256=UC-7F6w6fDsUIYf37aRnvUdiUUVk8qkJEUSuO17NQnI,1525
 tests/test_fhir_client_clone.py,sha256=c5y1rWJ32nBSUnK1FfyymY005dNowd4Nf1xrbuQolNk,5368
@@ -213,7 +213,7 @@ tests_integration/test_emr_server_auth.py,sha256=2I4QUAspQN89uGf6JB2aVuYaBeDnRJz
 tests_integration/test_firely_fhir.py,sha256=ll6-plwQrKfdrEyfbw0wLTC1jB-Qei1Mj-81tYTl5eQ,697
 tests_integration/test_merge_vs_smart_merge_behavior.py,sha256=LrIuyxzw0YLaTjcRtG0jzy0M6xSv9qebmdBtMPDcacQ,3733
 tests_integration/test_staging_server_graph.py,sha256=5RfMxjhdX9o4-n_ZRvze4Sm8u8NjRijRLDpqiz8qD_0,7132
-helix_fhir_client_sdk-4.2.24.dist-info/METADATA,sha256=cRV2bCk9JHlcp77O6pjLf6xQLzhsTLBheoVsA4plp0o,7210
-helix_fhir_client_sdk-4.2.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-helix_fhir_client_sdk-4.2.24.dist-info/top_level.txt,sha256=BRnDS6ceQxs-4u2jXznATObgP8G2cGAerlH0ZS4sJ6M,46
-helix_fhir_client_sdk-4.2.24.dist-info/RECORD,,
+helix_fhir_client_sdk-4.2.26.dist-info/METADATA,sha256=u3xzHMJVqLGpWobmBDUQ_zEdg-C23KShPjN7_mGmPok,7210
+helix_fhir_client_sdk-4.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+helix_fhir_client_sdk-4.2.26.dist-info/top_level.txt,sha256=BRnDS6ceQxs-4u2jXznATObgP8G2cGAerlH0ZS4sJ6M,46
+helix_fhir_client_sdk-4.2.26.dist-info/RECORD,,