diff --git a/webservice/webservice.py b/webservice/webservice.py index ec97eeb24fe4cfe9bd160f92640666bd1cf47a20..b3a7917e616b8ce889058c66ec54b57cfa9d0f9e 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -1163,6 +1163,9 @@ class ActionsServer: self, run_nrs, rid, detectors, action, instrument, cycle, proposal, request_time ) -> (str, Optional[str]): + report = "" + ret = "" + delim = ", " # run xfel_calibrate for karabo_id, dconfig in detectors.items(): detector = dconfig['detector-type'] @@ -1179,16 +1182,18 @@ class ActionsServer: ).split() cmd = parse_config(cmd, dconfig) - - ret = await run_action(self.job_db, cmd, self.mode, - proposal, run_nrs[-1], rid) - + # TODO: Add detector info in returned run action status. + ret += ( + await run_action( + self.job_db, cmd, self.mode, + proposal, run_nrs[-1], rid + ) + delim + ) if '--report-to' in cmd[:-1]: report_idx = cmd.index('--report-to') + 1 - report = cmd[report_idx] + '.pdf' - else: - report = None - return ret, report + report += cmd[report_idx] + '.pdf' + delim + # return string without a tailing comma. + return ret[:-2], report[:-2] if report != delim else None parser = argparse.ArgumentParser( description='Start the calibration webservice')