helix.fhir.client.sdk 4.2.15__py3-none-any.whl → 4.2.17__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- helix_fhir_client_sdk/fhir_auth_mixin.py +4 -2
- helix_fhir_client_sdk/fhir_client.py +36 -8
- helix_fhir_client_sdk/fhir_delete_mixin.py +61 -44
- helix_fhir_client_sdk/fhir_merge_mixin.py +188 -163
- helix_fhir_client_sdk/fhir_merge_resources_mixin.py +8 -4
- helix_fhir_client_sdk/fhir_patch_mixin.py +97 -81
- helix_fhir_client_sdk/fhir_update_mixin.py +71 -54
- helix_fhir_client_sdk/open_telemetry/attribute_names.py +3 -0
- helix_fhir_client_sdk/open_telemetry/span_names.py +4 -0
- helix_fhir_client_sdk/queue/request_queue_mixin.py +4 -2
- helix_fhir_client_sdk/utilities/retryable_aiohttp_client.py +34 -5
- helix_fhir_client_sdk/validators/async_fhir_validator.py +3 -0
- {helix_fhir_client_sdk-4.2.15.dist-info → helix_fhir_client_sdk-4.2.17.dist-info}/METADATA +39 -2
- {helix_fhir_client_sdk-4.2.15.dist-info → helix_fhir_client_sdk-4.2.17.dist-info}/RECORD +18 -17
- tests/async/test_retryable_client_session_management.py +159 -0
- {helix_fhir_client_sdk-4.2.15.dist-info → helix_fhir_client_sdk-4.2.17.dist-info}/WHEEL +0 -0
- {helix_fhir_client_sdk-4.2.15.dist-info → helix_fhir_client_sdk-4.2.17.dist-info}/licenses/LICENSE +0 -0
- {helix_fhir_client_sdk-4.2.15.dist-info → helix_fhir_client_sdk-4.2.17.dist-info}/top_level.txt +0 -0
|
@@ -299,7 +299,8 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
|
|
|
299
299
|
response_text: str | None = None
|
|
300
300
|
try:
|
|
301
301
|
async with RetryableAioHttpClient(
|
|
302
|
-
fn_get_session=
|
|
302
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
303
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
303
304
|
refresh_token_func=self._refresh_token_function,
|
|
304
305
|
tracer_request_func=self._trace_request_function,
|
|
305
306
|
retries=self._retry_count,
|
|
@@ -515,7 +516,8 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
|
|
|
515
516
|
response_text: str | None = None
|
|
516
517
|
try:
|
|
517
518
|
async with RetryableAioHttpClient(
|
|
518
|
-
fn_get_session=
|
|
519
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
520
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
519
521
|
refresh_token_func=self._refresh_token_function,
|
|
520
522
|
tracer_request_func=self._trace_request_function,
|
|
521
523
|
retries=self._retry_count,
|
|
@@ -675,11 +677,12 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
|
|
|
675
677
|
access_token: str | None = access_token_result.access_token
|
|
676
678
|
|
|
677
679
|
await AsyncFhirValidator.validate_fhir_resource(
|
|
678
|
-
fn_get_session=
|
|
680
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
679
681
|
json_data=resource.json(),
|
|
680
682
|
resource_name=cast(str | None, resource.get("resourceType")) or self._resource or "",
|
|
681
683
|
validation_server_url=self._validation_server_url,
|
|
682
684
|
access_token=access_token,
|
|
685
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
683
686
|
)
|
|
684
687
|
resource_json_list_clean.append(resource)
|
|
685
688
|
except FhirValidationException as e:
|
|
@@ -700,11 +703,12 @@ class FhirMergeResourcesMixin(FhirClientProtocol):
|
|
|
700
703
|
try:
|
|
701
704
|
with resource.transaction():
|
|
702
705
|
await AsyncFhirValidator.validate_fhir_resource(
|
|
703
|
-
fn_get_session=
|
|
706
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
704
707
|
json_data=resource.json(),
|
|
705
708
|
resource_name=resource.get("resourceType") or self._resource or "",
|
|
706
709
|
validation_server_url=self._validation_server_url,
|
|
707
710
|
access_token=access_token1,
|
|
711
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
708
712
|
)
|
|
709
713
|
resource_json_list_clean.append(resource)
|
|
710
714
|
except FhirValidationException as e:
|
|
@@ -2,8 +2,12 @@ import json
|
|
|
2
2
|
import time
|
|
3
3
|
|
|
4
4
|
from furl import furl
|
|
5
|
+
from opentelemetry import trace
|
|
6
|
+
from opentelemetry.trace import Status, StatusCode
|
|
5
7
|
|
|
6
8
|
from helix_fhir_client_sdk.exceptions.fhir_sender_exception import FhirSenderException
|
|
9
|
+
from helix_fhir_client_sdk.open_telemetry.attribute_names import FhirClientSdkOpenTelemetryAttributeNames
|
|
10
|
+
from helix_fhir_client_sdk.open_telemetry.span_names import FhirClientSdkOpenTelemetrySpanNames
|
|
7
11
|
from helix_fhir_client_sdk.responses.fhir_client_protocol import FhirClientProtocol
|
|
8
12
|
from helix_fhir_client_sdk.responses.fhir_update_response import FhirUpdateResponse
|
|
9
13
|
from helix_fhir_client_sdk.structures.get_access_token_result import (
|
|
@@ -18,6 +22,8 @@ from helix_fhir_client_sdk.utilities.retryable_aiohttp_response import (
|
|
|
18
22
|
RetryableAioHttpResponse,
|
|
19
23
|
)
|
|
20
24
|
|
|
25
|
+
TRACER = trace.get_tracer(__name__)
|
|
26
|
+
|
|
21
27
|
|
|
22
28
|
class FhirPatchMixin(FhirClientProtocol):
|
|
23
29
|
async def send_patch_request_async(self, data: str) -> FhirUpdateResponse:
|
|
@@ -33,93 +39,103 @@ class FhirPatchMixin(FhirClientProtocol):
|
|
|
33
39
|
raise ValueError("update should have only one id")
|
|
34
40
|
if not self._resource:
|
|
35
41
|
raise ValueError("update requires a FHIR resource type")
|
|
36
|
-
self._internal_logger.debug(
|
|
37
|
-
f"Calling patch method on {self._url} with client_id={self._client_id} and scopes={self._auth_scopes}"
|
|
38
|
-
)
|
|
39
|
-
full_uri: furl = furl(self._url)
|
|
40
|
-
full_uri /= self._resource
|
|
41
|
-
full_uri /= self._id
|
|
42
|
-
request_id: str | None = None
|
|
43
42
|
|
|
44
|
-
|
|
43
|
+
with TRACER.start_as_current_span(FhirClientSdkOpenTelemetrySpanNames.PATCH) as span:
|
|
44
|
+
span.set_attribute(FhirClientSdkOpenTelemetryAttributeNames.URL, self._url or "")
|
|
45
|
+
span.set_attribute(FhirClientSdkOpenTelemetryAttributeNames.RESOURCE, self._resource or "")
|
|
46
|
+
try:
|
|
47
|
+
self._internal_logger.debug(
|
|
48
|
+
f"Calling patch method on {self._url} with client_id={self._client_id} and scopes={self._auth_scopes}"
|
|
49
|
+
)
|
|
50
|
+
full_uri: furl = furl(self._url)
|
|
51
|
+
full_uri /= self._resource
|
|
52
|
+
full_uri /= self._id
|
|
53
|
+
request_id: str | None = None
|
|
45
54
|
|
|
46
|
-
|
|
47
|
-
headers = {"Content-Type": "application/json-patch+json"}
|
|
48
|
-
headers.update(self._additional_request_headers)
|
|
49
|
-
self._internal_logger.debug(f"Request headers: {headers}")
|
|
50
|
-
access_token_result: GetAccessTokenResult = await self.get_access_token_async()
|
|
51
|
-
access_token: str | None = access_token_result.access_token
|
|
52
|
-
# set access token in request if present
|
|
53
|
-
if access_token:
|
|
54
|
-
headers["Authorization"] = f"Bearer {access_token}"
|
|
55
|
+
start_time: float = time.time()
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
# Set up headers
|
|
58
|
+
headers = {"Content-Type": "application/json-patch+json"}
|
|
59
|
+
headers.update(self._additional_request_headers)
|
|
60
|
+
self._internal_logger.debug(f"Request headers: {headers}")
|
|
61
|
+
access_token_result: GetAccessTokenResult = await self.get_access_token_async()
|
|
62
|
+
access_token: str | None = access_token_result.access_token
|
|
63
|
+
# set access token in request if present
|
|
64
|
+
if access_token:
|
|
65
|
+
headers["Authorization"] = f"Bearer {access_token}"
|
|
58
66
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
# actually make the request
|
|
62
|
-
async with RetryableAioHttpClient(
|
|
63
|
-
fn_get_session=lambda: self.create_http_session(),
|
|
64
|
-
refresh_token_func=self._refresh_token_function,
|
|
65
|
-
tracer_request_func=self._trace_request_function,
|
|
66
|
-
retries=self._retry_count,
|
|
67
|
-
exclude_status_codes_from_retry=self._exclude_status_codes_from_retry,
|
|
68
|
-
use_data_streaming=self._use_data_streaming,
|
|
69
|
-
send_data_as_chunked=self._send_data_as_chunked,
|
|
70
|
-
compress=self._compress,
|
|
71
|
-
throw_exception_on_error=self._throw_exception_on_error,
|
|
72
|
-
log_all_url_results=self._log_all_response_urls,
|
|
73
|
-
access_token=self._access_token,
|
|
74
|
-
access_token_expiry_date=self._access_token_expiry_date,
|
|
75
|
-
) as client:
|
|
76
|
-
response: RetryableAioHttpResponse = await client.patch(
|
|
77
|
-
url=full_uri.url, json=deserialized_data, headers=headers
|
|
78
|
-
)
|
|
79
|
-
response_status = response.status
|
|
80
|
-
response_text = await response.get_text_async()
|
|
81
|
-
request_id = response.response_headers.get("X-Request-ID", None)
|
|
82
|
-
self._internal_logger.debug(f"X-Request-ID={request_id}")
|
|
67
|
+
response_text: str | None = None
|
|
68
|
+
response_status: int | None = None
|
|
83
69
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
self.
|
|
70
|
+
try:
|
|
71
|
+
deserialized_data = json.loads(data)
|
|
72
|
+
# actually make the request
|
|
73
|
+
async with RetryableAioHttpClient(
|
|
74
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
75
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
76
|
+
refresh_token_func=self._refresh_token_function,
|
|
77
|
+
tracer_request_func=self._trace_request_function,
|
|
78
|
+
retries=self._retry_count,
|
|
79
|
+
exclude_status_codes_from_retry=self._exclude_status_codes_from_retry,
|
|
80
|
+
use_data_streaming=self._use_data_streaming,
|
|
81
|
+
send_data_as_chunked=self._send_data_as_chunked,
|
|
82
|
+
compress=self._compress,
|
|
83
|
+
throw_exception_on_error=self._throw_exception_on_error,
|
|
84
|
+
log_all_url_results=self._log_all_response_urls,
|
|
85
|
+
access_token=self._access_token,
|
|
86
|
+
access_token_expiry_date=self._access_token_expiry_date,
|
|
87
|
+
) as client:
|
|
88
|
+
response: RetryableAioHttpResponse = await client.patch(
|
|
89
|
+
url=full_uri.url, json=deserialized_data, headers=headers
|
|
90
|
+
)
|
|
91
|
+
response_status = response.status
|
|
92
|
+
response_text = await response.get_text_async()
|
|
93
|
+
request_id = response.response_headers.get("X-Request-ID", None)
|
|
94
|
+
self._internal_logger.debug(f"X-Request-ID={request_id}")
|
|
95
|
+
|
|
96
|
+
if response_status == 200:
|
|
97
|
+
if self._logger:
|
|
98
|
+
self._logger.info(f"Successfully updated: {full_uri}")
|
|
99
|
+
elif response_status == 404:
|
|
100
|
+
if self._logger:
|
|
101
|
+
self._logger.info(f"Request resource was not found: {full_uri}")
|
|
102
|
+
else:
|
|
103
|
+
# other HTTP errors
|
|
104
|
+
self._internal_logger.info(f"PATCH response for {full_uri.url}: {response_status}")
|
|
105
|
+
except Exception as e:
|
|
106
|
+
raise FhirSenderException(
|
|
107
|
+
request_id=request_id,
|
|
108
|
+
url=full_uri.url,
|
|
109
|
+
headers=headers,
|
|
110
|
+
json_data=data,
|
|
111
|
+
response_text=response_text,
|
|
112
|
+
response_status_code=response_status,
|
|
113
|
+
exception=e,
|
|
114
|
+
variables=FhirClientLogger.get_variables_to_log(vars(self)),
|
|
115
|
+
message=f"Error: {e}",
|
|
116
|
+
elapsed_time=time.time() - start_time,
|
|
117
|
+
) from e
|
|
118
|
+
# check if response is json
|
|
119
|
+
if response_text:
|
|
120
|
+
try:
|
|
121
|
+
responses = json.loads(response_text)
|
|
122
|
+
except ValueError as e:
|
|
123
|
+
responses = {"issue": str(e)}
|
|
90
124
|
else:
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
) from e
|
|
106
|
-
# check if response is json
|
|
107
|
-
if response_text:
|
|
108
|
-
try:
|
|
109
|
-
responses = json.loads(response_text)
|
|
110
|
-
except ValueError as e:
|
|
111
|
-
responses = {"issue": str(e)}
|
|
112
|
-
else:
|
|
113
|
-
responses = {}
|
|
114
|
-
return FhirUpdateResponse(
|
|
115
|
-
request_id=request_id,
|
|
116
|
-
url=full_uri.tostr(),
|
|
117
|
-
responses=json.dumps(responses),
|
|
118
|
-
error=json.dumps(responses),
|
|
119
|
-
access_token=access_token,
|
|
120
|
-
status=response_status if response_status else 500,
|
|
121
|
-
resource_type=self._resource,
|
|
122
|
-
)
|
|
125
|
+
responses = {}
|
|
126
|
+
return FhirUpdateResponse(
|
|
127
|
+
request_id=request_id,
|
|
128
|
+
url=full_uri.tostr(),
|
|
129
|
+
responses=json.dumps(responses),
|
|
130
|
+
error=json.dumps(responses),
|
|
131
|
+
access_token=access_token,
|
|
132
|
+
status=response_status if response_status else 500,
|
|
133
|
+
resource_type=self._resource,
|
|
134
|
+
)
|
|
135
|
+
except Exception as e:
|
|
136
|
+
span.record_exception(e)
|
|
137
|
+
span.set_status(Status(StatusCode.ERROR, str(e)))
|
|
138
|
+
raise
|
|
123
139
|
|
|
124
140
|
def send_patch_request(self, data: str) -> FhirUpdateResponse:
|
|
125
141
|
"""
|
|
@@ -3,7 +3,11 @@ from collections.abc import AsyncGenerator
|
|
|
3
3
|
from compressedfhir.fhir.fhir_resource import FhirResource
|
|
4
4
|
from compressedfhir.fhir.fhir_resource_list import FhirResourceList
|
|
5
5
|
from furl import furl
|
|
6
|
+
from opentelemetry import trace
|
|
7
|
+
from opentelemetry.trace import Status, StatusCode
|
|
6
8
|
|
|
9
|
+
from helix_fhir_client_sdk.open_telemetry.attribute_names import FhirClientSdkOpenTelemetryAttributeNames
|
|
10
|
+
from helix_fhir_client_sdk.open_telemetry.span_names import FhirClientSdkOpenTelemetrySpanNames
|
|
7
11
|
from helix_fhir_client_sdk.responses.fhir_client_protocol import FhirClientProtocol
|
|
8
12
|
from helix_fhir_client_sdk.responses.fhir_update_response import FhirUpdateResponse
|
|
9
13
|
from helix_fhir_client_sdk.structures.get_access_token_result import (
|
|
@@ -15,6 +19,8 @@ from helix_fhir_client_sdk.utilities.retryable_aiohttp_client import (
|
|
|
15
19
|
)
|
|
16
20
|
from helix_fhir_client_sdk.validators.async_fhir_validator import AsyncFhirValidator
|
|
17
21
|
|
|
22
|
+
TRACER = trace.get_tracer(__name__)
|
|
23
|
+
|
|
18
24
|
|
|
19
25
|
class FhirUpdateMixin(FhirClientProtocol):
|
|
20
26
|
async def update_single_resource_async(self, *, resource: FhirResource) -> FhirUpdateResponse:
|
|
@@ -69,60 +75,71 @@ class FhirUpdateMixin(FhirClientProtocol):
|
|
|
69
75
|
raise ValueError("update should have only one id")
|
|
70
76
|
if not self._resource:
|
|
71
77
|
raise ValueError("update requires a FHIR resource type")
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
self.
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
78
|
+
|
|
79
|
+
with TRACER.start_as_current_span(FhirClientSdkOpenTelemetrySpanNames.UPDATE) as span:
|
|
80
|
+
span.set_attribute(FhirClientSdkOpenTelemetryAttributeNames.URL, self._url or "")
|
|
81
|
+
span.set_attribute(FhirClientSdkOpenTelemetryAttributeNames.RESOURCE, self._resource or "")
|
|
82
|
+
try:
|
|
83
|
+
full_uri: furl = furl(self._url)
|
|
84
|
+
full_uri /= self._resource
|
|
85
|
+
full_uri /= id_ or self._id
|
|
86
|
+
# set up headers
|
|
87
|
+
headers = {"Content-Type": "application/fhir+json"}
|
|
88
|
+
headers.update(self._additional_request_headers)
|
|
89
|
+
self._internal_logger.debug(f"Request headers: {headers}")
|
|
90
|
+
|
|
91
|
+
access_token_result: GetAccessTokenResult = await self.get_access_token_async()
|
|
92
|
+
access_token: str | None = access_token_result.access_token
|
|
93
|
+
# set access token in request if present
|
|
94
|
+
if access_token:
|
|
95
|
+
headers["Authorization"] = f"Bearer {access_token}"
|
|
96
|
+
|
|
97
|
+
if self._validation_server_url:
|
|
98
|
+
await AsyncFhirValidator.validate_fhir_resource(
|
|
99
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
100
|
+
json_data=json_data,
|
|
101
|
+
resource_name=self._resource,
|
|
102
|
+
validation_server_url=self._validation_server_url,
|
|
103
|
+
access_token=access_token,
|
|
104
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
105
|
+
)
|
|
106
|
+
|
|
107
|
+
# actually make the request
|
|
108
|
+
async with RetryableAioHttpClient(
|
|
109
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
110
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
111
|
+
refresh_token_func=self._refresh_token_function,
|
|
112
|
+
tracer_request_func=self._trace_request_function,
|
|
113
|
+
retries=self._retry_count,
|
|
114
|
+
exclude_status_codes_from_retry=self._exclude_status_codes_from_retry,
|
|
115
|
+
use_data_streaming=self._use_data_streaming,
|
|
116
|
+
send_data_as_chunked=self._send_data_as_chunked,
|
|
117
|
+
compress=self._compress,
|
|
118
|
+
throw_exception_on_error=self._throw_exception_on_error,
|
|
119
|
+
log_all_url_results=self._log_all_response_urls,
|
|
120
|
+
access_token=self._access_token,
|
|
121
|
+
access_token_expiry_date=self._access_token_expiry_date,
|
|
122
|
+
) as client:
|
|
123
|
+
response = await client.put(url=full_uri.url, data=json_data, headers=headers)
|
|
124
|
+
request_id = response.response_headers.get("X-Request-ID", None)
|
|
125
|
+
self._internal_logger.debug(f"X-Request-ID={request_id}")
|
|
126
|
+
if response.status == 200:
|
|
127
|
+
if self._logger:
|
|
128
|
+
self._logger.info(f"Successfully updated: {full_uri}")
|
|
129
|
+
|
|
130
|
+
return FhirUpdateResponse(
|
|
131
|
+
request_id=request_id,
|
|
132
|
+
url=full_uri.tostr(),
|
|
133
|
+
responses=await response.get_text_async(),
|
|
134
|
+
error=f"{response.status}" if not response.status == 200 else None,
|
|
135
|
+
access_token=access_token,
|
|
136
|
+
status=response.status,
|
|
137
|
+
resource_type=self._resource,
|
|
138
|
+
)
|
|
139
|
+
except Exception as e:
|
|
140
|
+
span.record_exception(e)
|
|
141
|
+
span.set_status(Status(StatusCode.ERROR, str(e)))
|
|
142
|
+
raise
|
|
126
143
|
|
|
127
144
|
def update(self, json_data: str) -> FhirUpdateResponse:
|
|
128
145
|
"""
|
|
@@ -2,3 +2,6 @@ class FhirClientSdkOpenTelemetryAttributeNames:
|
|
|
2
2
|
"""Constants for OpenTelemetry attribute names used in the FHIR Client SDK."""
|
|
3
3
|
|
|
4
4
|
URL: str = "fhir.client_sdk.url"
|
|
5
|
+
RESOURCE: str = "fhir.client_sdk.resource"
|
|
6
|
+
JSON_DATA_COUNT: str = "fhir.client_sdk.json_data.count"
|
|
7
|
+
BATCH_SIZE: str = "fhir.client_sdk.batch.size"
|
|
@@ -6,3 +6,7 @@ class FhirClientSdkOpenTelemetrySpanNames:
|
|
|
6
6
|
GET_ACCESS_TOKEN: str = "fhir.client_sdk.access_token.get"
|
|
7
7
|
HTTP_GET: str = "fhir.client_sdk.http.get"
|
|
8
8
|
HANDLE_RESPONSE: str = "fhir.client_sdk.handle_response"
|
|
9
|
+
DELETE: str = "fhir.client_sdk.delete"
|
|
10
|
+
UPDATE: str = "fhir.client_sdk.update"
|
|
11
|
+
PATCH: str = "fhir.client_sdk.patch"
|
|
12
|
+
MERGE: str = "fhir.client_sdk.merge"
|
|
@@ -119,7 +119,8 @@ class RequestQueueMixin(ABC, FhirClientProtocol):
|
|
|
119
119
|
)
|
|
120
120
|
|
|
121
121
|
async with RetryableAioHttpClient(
|
|
122
|
-
fn_get_session=
|
|
122
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
123
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
123
124
|
refresh_token_func=self._refresh_token_function,
|
|
124
125
|
tracer_request_func=self._trace_request_function,
|
|
125
126
|
retries=self._retry_count,
|
|
@@ -287,7 +288,8 @@ class RequestQueueMixin(ABC, FhirClientProtocol):
|
|
|
287
288
|
)
|
|
288
289
|
|
|
289
290
|
async with RetryableAioHttpClient(
|
|
290
|
-
fn_get_session=
|
|
291
|
+
fn_get_session=self._fn_create_http_session or self.create_http_session,
|
|
292
|
+
caller_managed_session=self._fn_create_http_session is not None,
|
|
291
293
|
refresh_token_func=self._refresh_token_function,
|
|
292
294
|
tracer_request_func=self._trace_request_function,
|
|
293
295
|
retries=self._retry_count,
|
|
@@ -37,6 +37,7 @@ class RetryableAioHttpClient:
|
|
|
37
37
|
refresh_token_func: RefreshTokenFunction | None,
|
|
38
38
|
tracer_request_func: TraceRequestFunction | None,
|
|
39
39
|
fn_get_session: Callable[[], ClientSession] | None = None,
|
|
40
|
+
caller_managed_session: bool = False,
|
|
40
41
|
exclude_status_codes_from_retry: list[int] | None = None,
|
|
41
42
|
use_data_streaming: bool | None,
|
|
42
43
|
compress: bool | None = False,
|
|
@@ -47,8 +48,32 @@ class RetryableAioHttpClient:
|
|
|
47
48
|
access_token_expiry_date: datetime | None,
|
|
48
49
|
) -> None:
|
|
49
50
|
"""
|
|
50
|
-
RetryableClient provides a way to make HTTP calls with automatic retry and automatic refreshing of access tokens
|
|
51
|
+
RetryableClient provides a way to make HTTP calls with automatic retry and automatic refreshing of access tokens.
|
|
51
52
|
|
|
53
|
+
Session Lifecycle Management:
|
|
54
|
+
- If caller_managed_session is False (default): The SDK manages the session lifecycle.
|
|
55
|
+
The session will be automatically closed when exiting the context manager.
|
|
56
|
+
- If caller_managed_session is True: The caller is responsible for managing the session lifecycle.
|
|
57
|
+
The SDK will NOT close the session - the caller must close it themselves.
|
|
58
|
+
|
|
59
|
+
:param retries: Number of retry attempts for failed requests
|
|
60
|
+
:param timeout_in_seconds: Timeout for HTTP requests
|
|
61
|
+
:param backoff_factor: Factor for exponential backoff between retries
|
|
62
|
+
:param retry_status_codes: HTTP status codes that trigger a retry
|
|
63
|
+
:param refresh_token_func: Function to refresh authentication tokens
|
|
64
|
+
:param tracer_request_func: Function to trace/log requests
|
|
65
|
+
:param fn_get_session: Optional callable that returns a ClientSession. If None, a basic
|
|
66
|
+
ClientSession will be created internally.
|
|
67
|
+
:param caller_managed_session: If True, the caller is responsible for closing the session.
|
|
68
|
+
If False (default), the SDK will close the session on exit.
|
|
69
|
+
:param exclude_status_codes_from_retry: Status codes to exclude from retry logic
|
|
70
|
+
:param use_data_streaming: Whether to stream response data
|
|
71
|
+
:param compress: Whether to compress request data
|
|
72
|
+
:param send_data_as_chunked: Whether to use chunked transfer encoding
|
|
73
|
+
:param throw_exception_on_error: Whether to raise exceptions on HTTP errors
|
|
74
|
+
:param log_all_url_results: Whether to log all URL results
|
|
75
|
+
:param access_token: Access token for authentication
|
|
76
|
+
:param access_token_expiry_date: Expiry date of the access token
|
|
52
77
|
"""
|
|
53
78
|
self.retries: int = retries
|
|
54
79
|
self.timeout_in_seconds: float | None = timeout_in_seconds
|
|
@@ -58,6 +83,8 @@ class RetryableAioHttpClient:
|
|
|
58
83
|
)
|
|
59
84
|
self.refresh_token_func_async: RefreshTokenFunction | None = refresh_token_func
|
|
60
85
|
self.trace_function_async: TraceRequestFunction | None = tracer_request_func
|
|
86
|
+
self._caller_managed_session: bool = caller_managed_session
|
|
87
|
+
# If no session factory provided, use a default one that creates a basic ClientSession
|
|
61
88
|
self.fn_get_session: Callable[[], ClientSession] = (
|
|
62
89
|
fn_get_session if fn_get_session is not None else lambda: ClientSession()
|
|
63
90
|
)
|
|
@@ -81,7 +108,9 @@ class RetryableAioHttpClient:
|
|
|
81
108
|
exc_val: BaseException | None,
|
|
82
109
|
exc_tb: type[BaseException] | None | None,
|
|
83
110
|
) -> None:
|
|
84
|
-
|
|
111
|
+
# Only close the session if SDK created it (fn_get_session was not provided)
|
|
112
|
+
# If the caller provided fn_get_session, they are responsible for closing the session
|
|
113
|
+
if not self._caller_managed_session and self.session is not None:
|
|
85
114
|
await self.session.close()
|
|
86
115
|
|
|
87
116
|
@staticmethod
|
|
@@ -115,7 +144,7 @@ class RetryableAioHttpClient:
|
|
|
115
144
|
try:
|
|
116
145
|
if headers:
|
|
117
146
|
kwargs["headers"] = headers
|
|
118
|
-
# if there is no data then remove from kwargs so as not to confuse aiohttp
|
|
147
|
+
# if there is no data, then remove from kwargs so as not to confuse aiohttp
|
|
119
148
|
if "data" in kwargs and kwargs["data"] is None:
|
|
120
149
|
del kwargs["data"]
|
|
121
150
|
# compression and chunked can only be enabled if there is content sent
|
|
@@ -399,7 +428,7 @@ class RetryableAioHttpClient:
|
|
|
399
428
|
if retry_after_text:
|
|
400
429
|
# noinspection PyBroadException
|
|
401
430
|
try:
|
|
402
|
-
if retry_after_text.isnumeric(): # it is number of seconds
|
|
431
|
+
if retry_after_text.isnumeric(): # it is a number of seconds
|
|
403
432
|
await asyncio.sleep(int(retry_after_text))
|
|
404
433
|
else:
|
|
405
434
|
wait_till: datetime = datetime.strptime(retry_after_text, "%a, %d %b %Y %H:%M:%S GMT")
|
|
@@ -413,7 +442,7 @@ class RetryableAioHttpClient:
|
|
|
413
442
|
if time_diff > 0:
|
|
414
443
|
await asyncio.sleep(time_diff)
|
|
415
444
|
except Exception:
|
|
416
|
-
# if there was some exception parsing the Retry-After header, sleep for 60 seconds
|
|
445
|
+
# if there was some exception, parsing the Retry-After header, sleep for 60 seconds
|
|
417
446
|
await asyncio.sleep(60)
|
|
418
447
|
else:
|
|
419
448
|
await asyncio.sleep(60)
|
|
@@ -23,6 +23,7 @@ class AsyncFhirValidator:
|
|
|
23
23
|
resource_name: str,
|
|
24
24
|
validation_server_url: str,
|
|
25
25
|
access_token: str | None,
|
|
26
|
+
caller_managed_session: bool = False,
|
|
26
27
|
) -> None:
|
|
27
28
|
"""
|
|
28
29
|
Calls the validation server url to validate the given resource
|
|
@@ -32,6 +33,7 @@ class AsyncFhirValidator:
|
|
|
32
33
|
:param resource_name: name of resource
|
|
33
34
|
:param validation_server_url: url to validation server
|
|
34
35
|
:param access_token: access token to use
|
|
36
|
+
:param caller_managed_session: if True, the caller is responsible for closing the session
|
|
35
37
|
"""
|
|
36
38
|
# check each resource against the validation server
|
|
37
39
|
headers = {"Content-Type": "application/fhir+json"}
|
|
@@ -42,6 +44,7 @@ class AsyncFhirValidator:
|
|
|
42
44
|
full_validation_uri /= "$validate"
|
|
43
45
|
async with RetryableAioHttpClient(
|
|
44
46
|
fn_get_session=fn_get_session,
|
|
47
|
+
caller_managed_session=caller_managed_session,
|
|
45
48
|
use_data_streaming=False,
|
|
46
49
|
access_token=access_token,
|
|
47
50
|
access_token_expiry_date=None,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: helix.fhir.client.sdk
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.17
|
|
4
4
|
Summary: helix.fhir.client.sdk
|
|
5
5
|
Home-page: https://github.com/icanbwell/helix.fhir.client.sdk
|
|
6
6
|
Author: Imran Qureshi
|
|
@@ -111,9 +111,46 @@ response: Optional[FhirGetResponse] = await FhirGetResponse.from_async_generator
|
|
|
111
111
|
```
|
|
112
112
|
|
|
113
113
|
# Data Streaming
|
|
114
|
-
For FHIR servers that support data streaming (e.g., b.well FHIR server), you can just set the `use_data_streaming` parameter to stream the data as it
|
|
114
|
+
For FHIR servers that support data streaming (e.g., b.well FHIR server), you can just set the `use_data_streaming` parameter to stream the data as it is received.
|
|
115
115
|
The data will be streamed in AsyncGenerators as described above.
|
|
116
116
|
|
|
117
|
+
# Persistent Sessions (Connection Reuse)
|
|
118
|
+
By default, the SDK creates a new HTTP session for each request. For better performance (~4× faster),
|
|
119
|
+
you can use persistent sessions to reuse connections across multiple requests.
|
|
120
|
+
|
|
121
|
+
**Important**: When you provide a custom session factory using `use_http_session()`, YOU are responsible
|
|
122
|
+
for managing the session lifecycle, including closing it when done. The SDK will NOT automatically close
|
|
123
|
+
user-provided sessions.
|
|
124
|
+
|
|
125
|
+
```python
|
|
126
|
+
import aiohttp
|
|
127
|
+
from helix_fhir_client_sdk.fhir_client import FhirClient
|
|
128
|
+
|
|
129
|
+
# Create a persistent session for connection reuse
|
|
130
|
+
session = aiohttp.ClientSession()
|
|
131
|
+
|
|
132
|
+
try:
|
|
133
|
+
# Configure FhirClient to use persistent session
|
|
134
|
+
fhir_client = (
|
|
135
|
+
FhirClient()
|
|
136
|
+
.url("https://fhir.example.com")
|
|
137
|
+
.resource("Patient")
|
|
138
|
+
.use_http_session(lambda: session) # User provides session factory
|
|
139
|
+
)
|
|
140
|
+
|
|
141
|
+
# Multiple requests reuse the same connection (~4× performance boost)
|
|
142
|
+
response1 = await fhir_client.get_async()
|
|
143
|
+
response2 = await fhir_client.clone().resource("Observation").get_async()
|
|
144
|
+
|
|
145
|
+
finally:
|
|
146
|
+
# User must close the session when done
|
|
147
|
+
await session.close()
|
|
148
|
+
```
|
|
149
|
+
|
|
150
|
+
**Session Lifecycle Rules**:
|
|
151
|
+
- **No custom factory** (default): SDK creates and closes the session automatically
|
|
152
|
+
- **Custom factory provided**: User is responsible for closing the session
|
|
153
|
+
|
|
117
154
|
# Storage Compression
|
|
118
155
|
The FHIR client SDK supports two types of compression:
|
|
119
156
|
|