Skip to content

Commit 8d9c2f1

Browse files
author
Takashi Matsuo
authored
[healthcare] fix: retry flaky API calls (GoogleCloudPlatform#3719)
also remove try-exceptions from the sample code. fixes GoogleCloudPlatform#3717
1 parent 136f58e commit 8d9c2f1

4 files changed

Lines changed: 88 additions & 102 deletions

File tree

‎healthcare/api-client/fhir/fhir_resources.py‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import os
1818

1919
from google.auth.transport import requests
20-
from googleapiclient.errors import HttpError
2120
from google.oauth2 import service_account
2221

2322
_BASE_URL = "https://healthcare.googleapis.com/v1beta1"
@@ -72,19 +71,14 @@ def create_patient(
7271
"resourceType": "Patient",
7372
}
7473

75-
try:
76-
response = session.post(fhir_store_path, headers=headers, json=body)
77-
response.raise_for_status()
78-
79-
resource = response.json()
74+
response = session.post(fhir_store_path, headers=headers, json=body)
75+
response.raise_for_status()
8076

81-
print("Created Patient resource with ID {}".format(resource["id"]))
77+
resource = response.json()
8278

83-
return response
84-
except HttpError as err:
85-
print(err)
86-
return ""
79+
print("Created Patient resource with ID {}".format(resource["id"]))
8780

81+
return response
8882

8983
# [END healthcare_create_resource]
9084

@@ -130,19 +124,14 @@ def create_encounter(
130124
"resourceType": "Encounter",
131125
}
132126

133-
try:
134-
response = session.post(fhir_store_path, headers=headers, json=body)
135-
response.raise_for_status()
136-
137-
resource = response.json()
127+
response = session.post(fhir_store_path, headers=headers, json=body)
128+
response.raise_for_status()
138129

139-
print("Created Encounter resource with ID {}".format(resource["id"]))
130+
resource = response.json()
140131

141-
return response
142-
except HttpError as err:
143-
print(err)
144-
return ""
132+
print("Created Encounter resource with ID {}".format(resource["id"]))
145133

134+
return response
146135

147136
# [END healthcare_create_encounter]
148137

@@ -185,19 +174,14 @@ def create_observation(
185174
"context": {"reference": "Encounter/{}".format(encounter_id)},
186175
}
187176

188-
try:
189-
response = session.post(fhir_store_path, headers=headers, json=body)
190-
response.raise_for_status()
191-
192-
resource = response.json()
177+
response = session.post(fhir_store_path, headers=headers, json=body)
178+
response.raise_for_status()
193179

194-
print("Created Observation resource with ID {}".format(resource["id"]))
180+
resource = response.json()
195181

196-
return response
197-
except HttpError as err:
198-
print(err)
199-
return ""
182+
print("Created Observation resource with ID {}".format(resource["id"]))
200183

184+
return response
201185

202186
# [END healthcare_create_observation]
203187

‎healthcare/api-client/fhir/fhir_resources_test.py‎

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import sys
1818
import uuid
1919

20+
import backoff
21+
from requests.exceptions import HTTPError
22+
2023
# Add datasets for bootstrapping datasets for testing
2124
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "datasets")) # noqa
2225
import datasets
@@ -34,6 +37,11 @@
3437
resource_type = "Patient"
3538

3639

40+
# A giveup callback for backoff.
41+
def fatal_code(e):
42+
return 400 <= e.response.status_code < 500
43+
44+
3745
@pytest.fixture(scope="module")
3846
def test_dataset():
3947
dataset = datasets.create_dataset(
@@ -258,37 +266,56 @@ def test_conditional_delete_resource(test_dataset, test_fhir_store, test_patient
258266
# The conditional method tests use an Observation, so we have to create an
259267
# Encounter from test_patient and then create an Observation from the
260268
# Encounter.
261-
encounter_response = fhir_resources.create_encounter(
262-
service_account_json,
263-
base_url,
264-
project_id,
265-
cloud_region,
266-
dataset_id,
267-
fhir_store_id,
268-
test_patient,
269-
)
270269

271-
encounter_resource_id = encounter_response.json()["id"]
272-
273-
fhir_resources.create_observation(
274-
service_account_json,
275-
base_url,
276-
project_id,
277-
cloud_region,
278-
dataset_id,
279-
fhir_store_id,
280-
test_patient,
281-
encounter_resource_id,
270+
@backoff.on_exception(
271+
backoff.expo, HTTPError, max_time=60, giveup=fatal_code
282272
)
283-
284-
fhir_resources.conditional_delete_resource(
285-
service_account_json,
286-
base_url,
287-
project_id,
288-
cloud_region,
289-
dataset_id,
290-
fhir_store_id,
273+
def create_encounter():
274+
encounter_response = fhir_resources.create_encounter(
275+
service_account_json,
276+
base_url,
277+
project_id,
278+
cloud_region,
279+
dataset_id,
280+
fhir_store_id,
281+
test_patient,
282+
)
283+
284+
return encounter_response.json()["id"]
285+
286+
encounter_resource_id = create_encounter()
287+
288+
@backoff.on_exception(
289+
backoff.expo, HTTPError, max_time=60, giveup=fatal_code
290+
)
291+
def create_observation():
292+
fhir_resources.create_observation(
293+
service_account_json,
294+
base_url,
295+
project_id,
296+
cloud_region,
297+
dataset_id,
298+
fhir_store_id,
299+
test_patient,
300+
encounter_resource_id,
301+
)
302+
303+
create_observation()
304+
305+
@backoff.on_exception(
306+
backoff.expo, HTTPError, max_time=60, giveup=fatal_code
291307
)
308+
def conditional_delete_resource():
309+
fhir_resources.conditional_delete_resource(
310+
service_account_json,
311+
base_url,
312+
project_id,
313+
cloud_region,
314+
dataset_id,
315+
fhir_store_id,
316+
)
317+
318+
conditional_delete_resource()
292319

293320
out, _ = capsys.readouterr()
294321

‎healthcare/api-client/fhir/fhir_stores.py‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import os
1717

1818
from googleapiclient import discovery
19-
from googleapiclient.errors import HttpError
2019
from google.oauth2 import service_account
2120

2221

@@ -67,14 +66,9 @@ def create_fhir_store(
6766
.create(parent=fhir_store_parent, body=body, fhirStoreId=fhir_store_id)
6867
)
6968

70-
try:
71-
response = request.execute()
72-
print("Created FHIR store: {}".format(fhir_store_id))
73-
return response
74-
except HttpError as e:
75-
print("Error, FHIR store not created: {}".format(e))
76-
return ""
77-
69+
response = request.execute()
70+
print("Created FHIR store: {}".format(fhir_store_id))
71+
return response
7872

7973
# [END healthcare_create_fhir_store]
8074

@@ -98,14 +92,9 @@ def delete_fhir_store(
9892
.delete(name=fhir_store_name)
9993
)
10094

101-
try:
102-
response = request.execute()
103-
print("Deleted FHIR store: {}".format(fhir_store_id))
104-
return response
105-
except HttpError as e:
106-
print("Error, FHIR store not deleted: {}".format(e))
107-
return ""
108-
95+
response = request.execute()
96+
print("Deleted FHIR store: {}".format(fhir_store_id))
97+
return response
10998

11099
# [END healthcare_delete_fhir_store]
111100

@@ -202,16 +191,11 @@ def patch_fhir_store(
202191
.patch(name=fhir_store_name, updateMask="notificationConfig", body=patch)
203192
)
204193

205-
try:
206-
response = request.execute()
207-
print(
208-
"Patched FHIR store {} with Cloud Pub/Sub topic: None".format(fhir_store_id)
209-
)
210-
return response
211-
except HttpError as e:
212-
print("Error, FHIR store not patched: {}".format(e))
213-
return ""
214-
194+
response = request.execute()
195+
print(
196+
"Patched FHIR store {} with Cloud Pub/Sub topic: None".format(fhir_store_id)
197+
)
198+
return response
215199

216200
# [END healthcare_patch_fhir_store]
217201

@@ -238,14 +222,9 @@ def export_fhir_store_gcs(
238222
.export(name=fhir_store_name, body=body)
239223
)
240224

241-
try:
242-
response = request.execute()
243-
print("Exported FHIR resources to bucket: gs://{}".format(gcs_uri))
244-
return response
245-
except HttpError as e:
246-
print("Error, FHIR resources not exported: {}".format(e))
247-
return ""
248-
225+
response = request.execute()
226+
print("Exported FHIR resources to bucket: gs://{}".format(gcs_uri))
227+
return response
249228

250229
# [END healthcare_export_fhir_resources_gcs]
251230

@@ -278,14 +257,9 @@ def import_fhir_resources(
278257
.import_(name=fhir_store_name, body=body)
279258
)
280259

281-
try:
282-
response = request.execute()
283-
print("Imported FHIR resources: {}".format(gcs_uri))
284-
return response
285-
except HttpError as e:
286-
print("Error, FHIR resources not imported: {}".format(e))
287-
return ""
288-
260+
response = request.execute()
261+
print("Imported FHIR resources: {}".format(gcs_uri))
262+
return response
289263

290264
# [END healthcare_import_fhir_resources]
291265

‎healthcare/api-client/fhir/requirements-test.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
backoff==1.10.0
12
pytest==5.3.2

0 commit comments

Comments
 (0)