From ff2045b230c708879b3b9ff835358a74ce55605c Mon Sep 17 00:00:00 2001 From: Charles Trenholm Date: Fri, 25 Feb 2022 15:29:18 -0800 Subject: [PATCH] Add field to filter_samplesets report that warns users about empty sample sets --- lib/sample_uploader/sample_uploaderImpl.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/sample_uploader/sample_uploaderImpl.py b/lib/sample_uploader/sample_uploaderImpl.py index 66b1acc..7fbcb92 100644 --- a/lib/sample_uploader/sample_uploaderImpl.py +++ b/lib/sample_uploader/sample_uploaderImpl.py @@ -753,7 +753,7 @@ def filter_samplesets(self, ctx, params): }) report_client = KBaseReport(self.callback_url) - report_info = report_client.create_extended_report({ + report_params = { 'objects_created': [ { 'ref': "/".join([str(info[6]), str(info[0]), str(info[4])]) @@ -762,7 +762,16 @@ def filter_samplesets(self, ctx, params): 'message': f"SampleSet object named \"{params['out_sample_set_name']}\" \ created with condition(s): {conditions_summary}", 'workspace_name': params['workspace_name'] - }) + } + + if not len(sample_search_api_response['sample_ids']): + warning_msg = "Warning: It appears your filtered sample set contains no samples. \ + Attempting to open or view this sample set will result in an error \ + from the Sample Service." + report_params['warnings'] = [warning_msg] + + report_info = report_client.create_extended_report(report_params) + output = { 'report_name': report_info['name'], 'report_ref': report_info['ref'],