Add DICOMweb search study by tags sample (GoogleCloudPlatform#2466)

Author: noerog

healthcare/api-client/dicom/dicomweb.py

@@ -152,6 +152,41 @@ def dicomweb_retrieve_study(
 # [END healthcare_dicomweb_retrieve_study]
 
 
+# [START healthcare_dicomweb_search_studies]
+def dicomweb_search_studies(
+        service_account_json,
+        base_url,
+        project_id,
+        cloud_region,
+        dataset_id,
+        dicom_store_id):
+    """Handles the GET requests specified in the DICOMweb standard."""
+    url = '{}/projects/{}/locations/{}'.format(base_url,
+                                               project_id, cloud_region)
+
+    dicomweb_path = '{}/datasets/{}/dicomStores/{}/dicomWeb/studies'.format(
+        url, dataset_id, dicom_store_id)
+
+    # Refine your search by appending DICOM tags to the
+    # request in the form of query parameters. This sample
+    # searches for studies containing a patient's name.
+    params = {'PatientName': 'Sally Zhang'}
+
+    session = get_session(service_account_json)
+
+    response = session.get(dicomweb_path, params=params)
+
+    response.raise_for_status()
+
+    patients = response.json()
+
+    print('Patients found matching query:')
+    print(json.dumps(patients, indent=2))
+
+    return patients
+# [END healthcare_dicomweb_search_studies]
+
+
 # [START healthcare_dicomweb_retrieve_instance]
 def dicomweb_retrieve_instance(
         service_account_json,
@@ -342,6 +377,9 @@ def parse_command_line_args():
     command.add_parser(
         'dicomweb-retrieve-study',
         help=dicomweb_retrieve_study.__doc__)
+    command.add_parser(
+        'dicomweb-search-studies',
+        help=dicomweb_search_studies.__doc__)
     command.add_parser(
         'dicomweb-retrieve-instance',
         help=dicomweb_retrieve_instance.__doc__)
@@ -403,6 +441,15 @@ def run_command(args):
             args.series_uid,
             args.instance_uid)
 
+    elif args.command == 'dicomweb-search-studies':
+        dicomweb_search_studies(
+            args.service_account_json,
+            args.base_url,
+            args.project_id,
+            args.cloud_region,
+            args.dataset_id,
+            args.dicom_store_id)
+
     elif args.command == 'dicomweb-retrieve-rendered':
         dicomweb_retrieve_rendered(
             args.service_account_json,

healthcare/api-client/dicom/dicomweb_test.py

@@ -106,7 +106,8 @@ def test_dicomweb_store_instance(test_dataset, test_dicom_store, capsys):
         study_uid)
 
 
-def test_dicomweb_search_instance(test_dataset, test_dicom_store, capsys):
+def test_dicomweb_search_instance_studies(
+        test_dataset, test_dicom_store, capsys):
     dicomweb.dicomweb_store_instance(
         service_account_json,
         base_url,
@@ -124,10 +125,20 @@ def test_dicomweb_search_instance(test_dataset, test_dicom_store, capsys):
         dataset_id,
         dicom_store_id)
 
+    dicomweb.dicomweb_search_studies(
+        service_account_json,
+        base_url,
+        project_id,
+        cloud_region,
+        dataset_id,
+        dicom_store_id)
+
     out, _ = capsys.readouterr()
 
-    # Check that store instance worked
+    # Check that search instance worked
     assert 'Instances:' in out
+    # Check that search studies worked
+    assert 'Patients found matching query' in out
 
     dicomweb.dicomweb_delete_study(
         service_account_json,