helix.fhir.client.sdk 4.2.16__tar.gz → 4.2.17__tar.gz

{helix_fhir_client_sdk-4.2.16/helix.fhir.client.sdk.egg-info → helix_fhir_client_sdk-4.2.17}/PKG-INFO

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

helix_fhir_client_sdk-4.2.17/VERSION

@@ -0,0 +1 @@
+4.2.17

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17/helix.fhir.client.sdk.egg-info}/PKG-INFO

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

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_auth_mixin.py

@@ -170,7 +170,8 @@ class FhirAuthMixin(FhirClientProtocol):
         :return: auth server url or None
         """
         async with RetryableAioHttpClient(
-            fn_get_session=lambda: self.create_http_session(),
+            fn_get_session=self._fn_create_http_session or self.create_http_session,
+            caller_managed_session=self._fn_create_http_session is not None,
             exclude_status_codes_from_retry=[404],
             throw_exception_on_error=False,
             use_data_streaming=False,
@@ -272,7 +273,8 @@ class FhirAuthMixin(FhirClientProtocol):
         }
 
         async with RetryableAioHttpClient(
-            fn_get_session=lambda: self.create_http_session(),
+            fn_get_session=self._fn_create_http_session or self.create_http_session,
+            caller_managed_session=self._fn_create_http_session is not None,
             use_data_streaming=False,
             compress=False,
             exclude_status_codes_from_retry=None,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_client.py

@@ -846,16 +846,13 @@ class FhirClient(
 
     def create_http_session(self) -> ClientSession:
         """
-        Creates an HTTP Session.
+        Creates the SDK's default HTTP Session.
 
-        If a custom session factory was set via use_http_session(), it will be used.
-        Otherwise, creates a default aiohttp ClientSession with standard configuration.
-        """
-        # Use a custom session factory if provided
-        if self._fn_create_http_session is not None:
-            return self._fn_create_http_session()
+        This method always creates a new aiohttp ClientSession with standard configuration.
+        The SDK manages the lifecycle of sessions created by this method.
 
-        # Default implementation
+        Note: If you want to provide your own session factory, use use_http_session() instead.
+        """
         trace_config = aiohttp.TraceConfig()
         # trace_config.on_request_start.append(on_request_start)
         if self._log_level == "DEBUG":

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_delete_mixin.py

@@ -56,7 +56,8 @@ class FhirDeleteMixin(FhirClientProtocol):
                     headers["Authorization"] = f"Bearer {access_token}"
 
                 async with RetryableAioHttpClient(
-                    fn_get_session=lambda: self.create_http_session(),
+                    fn_get_session=self._fn_create_http_session or self.create_http_session,
+                    caller_managed_session=self._fn_create_http_session is not None,
                     refresh_token_func=self._refresh_token_function,
                     retries=self._retry_count,
                     exclude_status_codes_from_retry=self._exclude_status_codes_from_retry,
@@ -129,7 +130,8 @@ class FhirDeleteMixin(FhirClientProtocol):
             headers["Authorization"] = f"Bearer {access_token}"
 
         async with RetryableAioHttpClient(
-            fn_get_session=lambda: self.create_http_session(),
+            fn_get_session=self._fn_create_http_session or self.create_http_session,
+            caller_managed_session=self._fn_create_http_session is not None,
             refresh_token_func=self._refresh_token_function,
             retries=self._retry_count,
             exclude_status_codes_from_retry=self._exclude_status_codes_from_retry,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_merge_mixin.py

@@ -54,11 +54,12 @@ class FhirMergeMixin(FhirClientProtocol):
                 access_token: str | None = access_token_result.access_token
 
                 await AsyncFhirValidator.validate_fhir_resource(
-                    fn_get_session=lambda: self.create_http_session(),
+                    fn_get_session=self._fn_create_http_session or self.create_http_session,
                     json_data=json.dumps(resource_json),
                     resource_name=cast(str | None, resource_json.get("resourceType")) or self._resource or "",
                     validation_server_url=self._validation_server_url,
                     access_token=access_token,
+                    caller_managed_session=self._fn_create_http_session is not None,
                 )
                 resource_json_list_clean.append(resource_json)
             except FhirValidationException as e:
@@ -75,11 +76,12 @@ class FhirMergeMixin(FhirClientProtocol):
                     access_token_result1: GetAccessTokenResult = await self.get_access_token_async()
                     access_token1: str | None = access_token_result1.access_token
                     await AsyncFhirValidator.validate_fhir_resource(
-                        fn_get_session=lambda: self.create_http_session(),
+                        fn_get_session=self._fn_create_http_session or self.create_http_session,
                         json_data=json.dumps(resource_json),
                         resource_name=resource_json.get("resourceType") or self._resource or "",
                         validation_server_url=self._validation_server_url,
                         access_token=access_token1,
+                        caller_managed_session=self._fn_create_http_session is not None,
                     )
                     resource_json_list_clean.append(resource_json)
                 except FhirValidationException as e:
@@ -183,7 +185,8 @@ class FhirMergeMixin(FhirClientProtocol):
                             response_text: str | None = None
                             try:
                                 async with RetryableAioHttpClient(
-                                    fn_get_session=lambda: self.create_http_session(),
+                                    fn_get_session=self._fn_create_http_session or self.create_http_session,
+                                    caller_managed_session=self._fn_create_http_session is not None,
                                     refresh_token_func=self._refresh_token_function,
                                     tracer_request_func=self._trace_request_function,
                                     retries=self._retry_count,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_merge_resources_mixin.py

@@ -299,7 +299,8 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
                 response_text: str | None = None
                 try:
                     async with RetryableAioHttpClient(
-                        fn_get_session=lambda: self.create_http_session(),
+                        fn_get_session=self._fn_create_http_session or self.create_http_session,
+                        caller_managed_session=self._fn_create_http_session is not None,
                         refresh_token_func=self._refresh_token_function,
                         tracer_request_func=self._trace_request_function,
                         retries=self._retry_count,
@@ -515,7 +516,8 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
                     response_text: str | None = None
                     try:
                         async with RetryableAioHttpClient(
-                            fn_get_session=lambda: self.create_http_session(),
+                            fn_get_session=self._fn_create_http_session or self.create_http_session,
+                            caller_managed_session=self._fn_create_http_session is not None,
                             refresh_token_func=self._refresh_token_function,
                             tracer_request_func=self._trace_request_function,
                             retries=self._retry_count,
@@ -675,11 +677,12 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
                     access_token: str | None = access_token_result.access_token
 
                     await AsyncFhirValidator.validate_fhir_resource(
-                        fn_get_session=lambda: self.create_http_session(),
+                        fn_get_session=self._fn_create_http_session or self.create_http_session,
                         json_data=resource.json(),
                         resource_name=cast(str | None, resource.get("resourceType")) or self._resource or "",
                         validation_server_url=self._validation_server_url,
                         access_token=access_token,
+                        caller_managed_session=self._fn_create_http_session is not None,
                     )
                     resource_json_list_clean.append(resource)
             except FhirValidationException as e:
@@ -700,11 +703,12 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
                 try:
                     with resource.transaction():
                         await AsyncFhirValidator.validate_fhir_resource(
-                            fn_get_session=lambda: self.create_http_session(),
+                            fn_get_session=self._fn_create_http_session or self.create_http_session,
                             json_data=resource.json(),
                             resource_name=resource.get("resourceType") or self._resource or "",
                             validation_server_url=self._validation_server_url,
                             access_token=access_token1,
+                            caller_managed_session=self._fn_create_http_session is not None,
                         )
                         resource_json_list_clean.append(resource)
                 except FhirValidationException as e:

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_patch_mixin.py

@@ -71,7 +71,8 @@ class FhirPatchMixin(FhirClientProtocol):
                     deserialized_data = json.loads(data)
                     # actually make the request
                     async with RetryableAioHttpClient(
-                        fn_get_session=lambda: self.create_http_session(),
+                        fn_get_session=self._fn_create_http_session or self.create_http_session,
+                        caller_managed_session=self._fn_create_http_session is not None,
                         refresh_token_func=self._refresh_token_function,
                         tracer_request_func=self._trace_request_function,
                         retries=self._retry_count,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/fhir_update_mixin.py

@@ -96,16 +96,18 @@ class FhirUpdateMixin(FhirClientProtocol):
 
                 if self._validation_server_url:
                     await AsyncFhirValidator.validate_fhir_resource(
-                        fn_get_session=lambda: self.create_http_session(),
+                        fn_get_session=self._fn_create_http_session or self.create_http_session,
                         json_data=json_data,
                         resource_name=self._resource,
                         validation_server_url=self._validation_server_url,
                         access_token=access_token,
+                        caller_managed_session=self._fn_create_http_session is not None,
                     )
 
                 # actually make the request
                 async with RetryableAioHttpClient(
-                    fn_get_session=lambda: self.create_http_session(),
+                    fn_get_session=self._fn_create_http_session or self.create_http_session,
+                    caller_managed_session=self._fn_create_http_session is not None,
                     refresh_token_func=self._refresh_token_function,
                     tracer_request_func=self._trace_request_function,
                     retries=self._retry_count,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/queue/request_queue_mixin.py

@@ -119,7 +119,8 @@ class RequestQueueMixin(ABC, FhirClientProtocol):
             )
 
             async with RetryableAioHttpClient(
-                fn_get_session=lambda: self.create_http_session(),
+                fn_get_session=self._fn_create_http_session or self.create_http_session,
+                caller_managed_session=self._fn_create_http_session is not None,
                 refresh_token_func=self._refresh_token_function,
                 tracer_request_func=self._trace_request_function,
                 retries=self._retry_count,
@@ -287,7 +288,8 @@ class RequestQueueMixin(ABC, FhirClientProtocol):
             )
 
             async with RetryableAioHttpClient(
-                fn_get_session=lambda: self.create_http_session(),
+                fn_get_session=self._fn_create_http_session or self.create_http_session,
+                caller_managed_session=self._fn_create_http_session is not None,
                 refresh_token_func=self._refresh_token_function,
                 tracer_request_func=self._trace_request_function,
                 retries=self._retry_count,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/utilities/retryable_aiohttp_client.py

@@ -37,6 +37,7 @@ class RetryableAioHttpClient:
         refresh_token_func: RefreshTokenFunction | None,
         tracer_request_func: TraceRequestFunction | None,
         fn_get_session: Callable[[], ClientSession] | None = None,
+        caller_managed_session: bool = False,
         exclude_status_codes_from_retry: list[int] | None = None,
         use_data_streaming: bool | None,
         compress: bool | None = False,
@@ -50,9 +51,9 @@ class RetryableAioHttpClient:
         RetryableClient provides a way to make HTTP calls with automatic retry and automatic refreshing of access tokens.
 
         Session Lifecycle Management:
-        - If fn_get_session is None (default): The SDK creates and manages the session lifecycle.
+        - If caller_managed_session is False (default): The SDK manages the session lifecycle.
           The session will be automatically closed when exiting the context manager.
-        - If fn_get_session is provided: The caller is responsible for managing the session lifecycle.
+        - If caller_managed_session is True: The caller is responsible for managing the session lifecycle.
           The SDK will NOT close the session - the caller must close it themselves.
 
         :param retries: Number of retry attempts for failed requests
@@ -61,8 +62,10 @@ class RetryableAioHttpClient:
         :param retry_status_codes: HTTP status codes that trigger a retry
         :param refresh_token_func: Function to refresh authentication tokens
         :param tracer_request_func: Function to trace/log requests
-        :param fn_get_session: Optional callable that returns a ClientSession. If provided,
-                               the caller is responsible for closing the session.
+        :param fn_get_session: Optional callable that returns a ClientSession. If None, a basic
+                               ClientSession will be created internally.
+        :param caller_managed_session: If True, the caller is responsible for closing the session.
+                                       If False (default), the SDK will close the session on exit.
         :param exclude_status_codes_from_retry: Status codes to exclude from retry logic
         :param use_data_streaming: Whether to stream response data
         :param compress: Whether to compress request data
@@ -80,8 +83,8 @@ class RetryableAioHttpClient:
         )
         self.refresh_token_func_async: RefreshTokenFunction | None = refresh_token_func
         self.trace_function_async: TraceRequestFunction | None = tracer_request_func
-        # Automatically determine if a session is caller-managed based on whether fn_get_session is provided
-        self._caller_managed_session: bool = fn_get_session is not None
+        self._caller_managed_session: bool = caller_managed_session
+        # If no session factory provided, use a default one that creates a basic ClientSession
         self.fn_get_session: Callable[[], ClientSession] = (
             fn_get_session if fn_get_session is not None else lambda: ClientSession()
         )

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/helix_fhir_client_sdk/validators/async_fhir_validator.py

@@ -23,6 +23,7 @@ class AsyncFhirValidator:
         resource_name: str,
         validation_server_url: str,
         access_token: str | None,
+        caller_managed_session: bool = False,
     ) -> None:
         """
         Calls the validation server url to validate the given resource
@@ -32,6 +33,7 @@ class AsyncFhirValidator:
         :param resource_name: name of resource
         :param validation_server_url: url to validation server
         :param access_token: access token to use
+        :param caller_managed_session: if True, the caller is responsible for closing the session
         """
         # check each resource against the validation server
         headers = {"Content-Type": "application/fhir+json"}
@@ -42,6 +44,7 @@ class AsyncFhirValidator:
         full_validation_uri /= "$validate"
         async with RetryableAioHttpClient(
             fn_get_session=fn_get_session,
+            caller_managed_session=caller_managed_session,
             use_data_streaming=False,
             access_token=access_token,
             access_token_expiry_date=None,

{helix_fhir_client_sdk-4.2.16 → helix_fhir_client_sdk-4.2.17}/tests/async/test_retryable_client_session_management.py

@@ -42,12 +42,13 @@ async def test_user_provided_session_is_not_closed_after_exit() -> None:
 
     try:
         # Provide a factory that returns the user's session
-        # Since fn_get_session is provided, SDK will NOT close the session
+        # Set caller_managed_session=True so SDK will NOT close the session
         client = RetryableAioHttpClient(
             retries=1,
             refresh_token_func=None,
             tracer_request_func=None,
             fn_get_session=lambda: user_session,  # User provides a custom factory
+            caller_managed_session=True,  # User manages session lifecycle
             use_data_streaming=False,
             access_token=None,
             access_token_expiry_date=None,
@@ -59,7 +60,7 @@ async def test_user_provided_session_is_not_closed_after_exit() -> None:
             assert not client.session.closed
 
         # After exiting context, the user's session should still be open
-        # because fn_get_session was provided (caller manages session lifecycle)
+        # because caller_managed_session=True (caller manages session lifecycle)
         assert not user_session.closed
 
     finally:
@@ -81,6 +82,7 @@ async def test_multiple_clients_can_share_user_session() -> None:
             refresh_token_func=None,
             tracer_request_func=None,
             fn_get_session=lambda: shared_session,
+            caller_managed_session=True,  # User manages session lifecycle
             use_data_streaming=False,
             access_token=None,
             access_token_expiry_date=None,
@@ -97,6 +99,7 @@ async def test_multiple_clients_can_share_user_session() -> None:
             refresh_token_func=None,
             tracer_request_func=None,
             fn_get_session=lambda: shared_session,
+            caller_managed_session=True,  # User manages session lifecycle
             use_data_streaming=False,
             access_token=None,
             access_token_expiry_date=None,
@@ -132,6 +135,7 @@ async def test_user_can_recreate_closed_session_via_factory() -> None:
             refresh_token_func=None,
             tracer_request_func=None,
             fn_get_session=session_factory,
+            caller_managed_session=True,  # User manages session lifecycle
             use_data_streaming=False,
             access_token=None,
             access_token_expiry_date=None,
@@ -140,7 +144,7 @@ async def test_user_can_recreate_closed_session_via_factory() -> None:
             created_sessions.append(client1.session)
             assert call_count == 1  # Factory called once in __aenter__
 
-        # SDK doesn't close session (caller provided fn_get_session)
+        # SDK doesn't close session (caller_managed_session=True)
         assert created_sessions[0] is not None
         assert not created_sessions[0].closed
 

helix_fhir_client_sdk-4.2.16/VERSION

@@ -1 +0,0 @@
-4.2.16