helix.fhir.client.sdk 4.2.12__tar.gz → 4.2.14__tar.gz

{helix_fhir_client_sdk-4.2.12/helix.fhir.client.sdk.egg-info → helix_fhir_client_sdk-4.2.14}/PKG-INFO

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

helix_fhir_client_sdk-4.2.14/VERSION

@@ -0,0 +1 @@
+4.2.14

{helix_fhir_client_sdk-4.2.12 → helix_fhir_client_sdk-4.2.14/helix.fhir.client.sdk.egg-info}/PKG-INFO

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

{helix_fhir_client_sdk-4.2.12 → helix_fhir_client_sdk-4.2.14}/helix_fhir_client_sdk/fhir_client.py

@@ -883,6 +883,8 @@ class FhirClient(
         fhir_client._client_id = self._client_id
         fhir_client._auth_server_url = self._auth_server_url
         fhir_client._login_token = self._login_token
+        fhir_client._access_token = self._access_token
+        fhir_client._access_token_expiry_date = self._access_token_expiry_date
         fhir_client._refresh_token_function = self._refresh_token_function
         fhir_client._exclude_status_codes_from_retry = self._exclude_status_codes_from_retry
         fhir_client._chunk_size = self._chunk_size
@@ -905,6 +907,8 @@ class FhirClient(
         fhir_client._trace_request_function = self._trace_request_function
         fhir_client._log_all_response_urls = self._log_all_response_urls
         fhir_client._create_operation_outcome_for_error = self._create_operation_outcome_for_error
+        if self._max_concurrent_requests is not None:
+            fhir_client.set_max_concurrent_requests(self._max_concurrent_requests)
         return fhir_client
 
     def set_log_all_response_urls(self, value: bool) -> FhirClient:

{helix_fhir_client_sdk-4.2.12 → helix_fhir_client_sdk-4.2.14}/helix_fhir_client_sdk/responses/fhir_client_protocol.py

@@ -128,6 +128,9 @@ class FhirClientProtocol(Protocol):
     _create_operation_outcome_for_error: bool | None
     """ whether to create OperationOutcome resource for errors """
 
+    _max_concurrent_requests: int | None
+    """ maximum number of concurrent requests to make to the FHIR server """
+
     async def get_access_token_async(self) -> GetAccessTokenResult: ...
 
     async def _send_fhir_request_async(
@@ -210,3 +213,5 @@ class FhirClientProtocol(Protocol):
     ) -> AsyncGenerator[FhirMergeResourceResponse, None]:
         # this is just here to tell Python this returns a generator
         yield None  # type: ignore[misc]
+
+    def set_persistent_session(self, session: ClientSession | None) -> "FhirClientProtocol": ...

{helix_fhir_client_sdk-4.2.12 → helix_fhir_client_sdk-4.2.14}/helix_fhir_client_sdk/utilities/retryable_aiohttp_client.py

@@ -74,10 +74,13 @@ class RetryableAioHttpClient:
         self.persistent_session: ClientSession | None = persistent_session
 
     async def __aenter__(self) -> "RetryableAioHttpClient":
-        if self.persistent_session is not None:
-            self.session = self.persistent_session
-        else:
-            self.session = self.fn_get_session()
+        # Clear a stale persistent session if closed
+        if self.persistent_session is not None and self.persistent_session.closed:
+            self.persistent_session = None
+
+        # Use an existing persistent session or create a new one
+        self.session = self.persistent_session if self.persistent_session is not None else self.fn_get_session()
+
         return self
 
     async def __aexit__(

{helix_fhir_client_sdk-4.2.12 → helix_fhir_client_sdk-4.2.14}/tests/test_fhir_client_clone.py

@@ -2,6 +2,8 @@
 Tests for FhirClient.clone() method to ensure all properties are properly copied.
 """
 
+from datetime import UTC, datetime, timedelta
+
 from compressedfhir.utilities.compressed_dict.v1.compressed_dict_storage_mode import (
     CompressedDictStorageMode,
 )
@@ -76,3 +78,35 @@ def test_default_storage_mode_is_raw() -> None:
     """Test that the default storage mode is 'raw'"""
     fhir_client = FhirClient()
     assert fhir_client._storage_mode.storage_type == "raw"
+
+
+def test_clone_preserves_access_token() -> None:
+    """Test that clone() preserves access token and expiry date"""
+    expiry_date = datetime.now(UTC) + timedelta(hours=1)
+    fhir_client = (
+        FhirClient()
+        .url("http://example.com")
+        .set_access_token("test-access-token-12345")
+        .set_access_token_expiry_date(expiry_date)
+    )
+
+    assert fhir_client._access_token == "test-access-token-12345"
+    assert fhir_client._access_token_expiry_date == expiry_date
+
+    # Clone and verify access token is preserved
+    cloned_client = fhir_client.clone()
+
+    assert cloned_client._access_token == "test-access-token-12345"
+    assert cloned_client._access_token_expiry_date == expiry_date
+
+
+def test_clone_preserves_max_concurrent_requests() -> None:
+    """Test that clone() preserves max_concurrent_requests setting"""
+    fhir_client = FhirClient().url("http://example.com").set_max_concurrent_requests(10)
+
+    assert fhir_client._max_concurrent_requests == 10
+
+    # Clone and verify max_concurrent_requests is preserved
+    cloned_client = fhir_client.clone()
+
+    assert cloned_client._max_concurrent_requests == 10

helix_fhir_client_sdk-4.2.12/VERSION

@@ -1 +0,0 @@
-4.2.12