helix.fhir.client.sdk 4.2.12__py3-none-any.whl → 4.2.14__py3-none-any.whl

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/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/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.dist-info → helix_fhir_client_sdk-4.2.14.dist-info}/METADATA

@@ -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.dist-info → helix_fhir_client_sdk-4.2.14.dist-info}/RECORD

@@ -3,7 +3,7 @@ helix_fhir_client_sdk/dictionary_parser.py,sha256=WrGkVAxMlUvVycRVrX7UZt2oP2e_Vk
 helix_fhir_client_sdk/dictionary_writer.py,sha256=V7Bx9Z69s0LRYF6Lc6Xp0d-Gj0BnAVKA1vBuwf3JORE,1486
 helix_fhir_client_sdk/fhir_auth_mixin.py,sha256=p2QIYrCv7ZktutY7SzYizmHADahxBddRTSCqX1EKyHc,14465
 helix_fhir_client_sdk/fhir_bundle_appender.py,sha256=t1hs7p_vXKC9MUFyUnN9dTuDhRF-kw-kkgVFtGHv9QQ,11749
-helix_fhir_client_sdk/fhir_client.py,sha256=vSkgWVgNlRkdu7RFPkD1-4BF9N88PnRXhCTSqUJqHlI,34930
+helix_fhir_client_sdk/fhir_client.py,sha256=P8xhTVNnJuo5UGbg5nrFOlAR4DAOlEstH27YtFHub00,35201
 helix_fhir_client_sdk/fhir_delete_mixin.py,sha256=1YiKddTJTUzzrRvG7WgSisXY8rfJAHPAEXTsOevrom8,6521
 helix_fhir_client_sdk/fhir_merge_mixin.py,sha256=YTUODvc2rqXhk5_kwNMFPykm1I9_omww2WUcDExMESg,15264
 helix_fhir_client_sdk/fhir_merge_resources_mixin.py,sha256=d5x41uL__yxMcaAnYDdmbpt529ZsOZcO0EBvnV1HSGI,36002
@@ -44,7 +44,7 @@ helix_fhir_client_sdk/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 helix_fhir_client_sdk/queue/request_queue_mixin.py,sha256=L5HgWWARj-JoM7v4cradNonDK1aO1BQyl2MWZknP_PY,21806
 helix_fhir_client_sdk/responses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 helix_fhir_client_sdk/responses/bundle_expander.py,sha256=ilR5eMgciSgzsdQvKB6bHtn9jtpvn3uS-EBz-hrahzo,1065
-helix_fhir_client_sdk/responses/fhir_client_protocol.py,sha256=cKt0lNYFc5HPWZcHaaW8UFO7iHl16QmG93sbDKFJVvs,6785
+helix_fhir_client_sdk/responses/fhir_client_protocol.py,sha256=QbkKa3x6czhy-QCLN1icctBSXBlLnll1Lj9kMdFm914,7002
 helix_fhir_client_sdk/responses/fhir_delete_response.py,sha256=0K11vyfZ0LtL-G61NHzDqHrZgEHjMVZr00VWpWcktZA,2941
 helix_fhir_client_sdk/responses/fhir_get_response.py,sha256=3PXvFoMZ7ix2ZzucIjY-49RL3foLR07dD57BdulyMGI,17657
 helix_fhir_client_sdk/responses/fhir_merge_response.py,sha256=uvUjEGJgMDlAkcc5_LjgAsTFZqREQMlV79sbxUZwtwE,2862
@@ -104,7 +104,7 @@ helix_fhir_client_sdk/utilities/hash_util.py,sha256=YNUy7-IC_OtC0l-T45UO9UkA-_ps
 helix_fhir_client_sdk/utilities/list_chunker.py,sha256=2h2k5CCFmOhICaugOx6UI-9dh4q5w1lVdF7WQLX0LCM,1456
 helix_fhir_client_sdk/utilities/ndjson_chunk_streaming_parser.py,sha256=3TCYfWVCEpJbqRxqlSDsGnFnraO4T9bxzYdShvu6Pos,1954
 helix_fhir_client_sdk/utilities/practitioner_generator.py,sha256=gneCAXNDNEphBY-Nc2nMQBbEWJgHcjvv3S8JQ75yiJI,3778
-helix_fhir_client_sdk/utilities/retryable_aiohttp_client.py,sha256=pxB4N0nkNBo2LT59tr1WnLBqiyr0J6l2OfXVMad1WJU,20898
+helix_fhir_client_sdk/utilities/retryable_aiohttp_client.py,sha256=yjZ0hUWNG4JD8sWgPGXYmYsY_wzaJM0cWD_Vo2LG8Sg,21095
 helix_fhir_client_sdk/utilities/retryable_aiohttp_response.py,sha256=DvNX6WO1m2Hz6LoI5CwSPDECPd8oDsqRCVsyq_Oxf-0,3542
 helix_fhir_client_sdk/utilities/retryable_aiohttp_url_result.py,sha256=Gdmvn6qIM2JF0YOhobQUHY41fCxvYyaths_CZs0iJfo,616
 helix_fhir_client_sdk/utilities/url_checker.py,sha256=_JRSIvu7WNXh2OA79HJbEEiomGT-quGhAUGh44-9824,3580
@@ -130,10 +130,10 @@ helix_fhir_client_sdk/validators/async_fhir_validator.py,sha256=Bgiw5atbc5YzBYpk
 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.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+helix_fhir_client_sdk-4.2.14.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=ZjC0ctog5r8Ba0ZD94ggwbnbQMeQdxk5pTt3zTpE8rQ,2832
+tests/test_fhir_client_clone.py,sha256=tKL-Kz9sUc1mTkaGO0QQtgO5_8ZuBdDICm_oNTV12sY,4030
 tests/test_get_nested_property.py,sha256=dA7eNmPJuwzQTViORRmJkcn9RAZzxeajSxUghobHpAo,2381
 tests/async/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/async/test_async_fhir_client_fetch_response_in_chunks.py,sha256=Ql95DuOqaidFL6u553f-Bkp4Rsd662C__NA-5sw0KL0,3993
@@ -212,7 +212,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.12.dist-info/METADATA,sha256=5eIjcGvbBwNeb90I6olYBeLlpLDlSZrLTEO1xwopu04,5845
-helix_fhir_client_sdk-4.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-helix_fhir_client_sdk-4.2.12.dist-info/top_level.txt,sha256=BRnDS6ceQxs-4u2jXznATObgP8G2cGAerlH0ZS4sJ6M,46
-helix_fhir_client_sdk-4.2.12.dist-info/RECORD,,
+helix_fhir_client_sdk-4.2.14.dist-info/METADATA,sha256=k5OlcbCO8MQ7ButJErmJBVXEV7nOSZ9oDHlXxomX_a4,5845
+helix_fhir_client_sdk-4.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+helix_fhir_client_sdk-4.2.14.dist-info/top_level.txt,sha256=BRnDS6ceQxs-4u2jXznATObgP8G2cGAerlH0ZS4sJ6M,46
+helix_fhir_client_sdk-4.2.14.dist-info/RECORD,,

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