helix.fhir.client.sdk 4.2.24__tar.gz → 4.2.26__tar.gz

{helix_fhir_client_sdk-4.2.24/helix.fhir.client.sdk.egg-info → helix_fhir_client_sdk-4.2.26}/PKG-INFO

@@ -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.26/VERSION

@@ -0,0 +1 @@
+4.2.26

{helix_fhir_client_sdk-4.2.24 → helix_fhir_client_sdk-4.2.26/helix.fhir.client.sdk.egg-info}/PKG-INFO

@@ -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 → helix_fhir_client_sdk-4.2.26}/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-4.2.24 → helix_fhir_client_sdk-4.2.26}/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-4.2.24 → helix_fhir_client_sdk-4.2.26}/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-4.2.24 → helix_fhir_client_sdk-4.2.26}/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/VERSION

@@ -1 +0,0 @@
-4.2.24