From f5ddc4809840f1610a6f6bfd7a60ef1b1007b82a Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Mon, 18 Mar 2024 06:26:50 -0400 Subject: [PATCH] annotate reports with centre identifiers, add path check to register CLI --- wis2_gdc/registrar.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wis2_gdc/registrar.py b/wis2_gdc/registrar.py index 53a36cb..7204bba 100644 --- a/wis2_gdc/registrar.py +++ b/wis2_gdc/registrar.py @@ -95,6 +95,8 @@ def register(self, metadata: dict) -> None: LOGGER.info('Running ETS') ets_results = self._run_ets() + ets_results['report-by'] = CENTRE_ID + ets_results['centre-id'] = self.centre_id if PUBLISH_REPORTS: LOGGER.info('Publishing ETS report to broker') @@ -129,6 +131,8 @@ def register(self, metadata: dict) -> None: if RUN_KPI: LOGGER.info('Running KPI') kpi_results = self._run_kpi() + kpi_results['report-by'] = CENTRE_ID + kpi_results['centre-id'] = self.centre_id if PUBLISH_REPORTS: LOGGER.info('Publishing KPI report to broker') @@ -253,7 +257,8 @@ def teardown(ctx, bypass, verbosity='NOTSET'): @click.command() @click.pass_context -@click.argument('path') +@click.argument( + 'path', type=click.Path(exists=True, dir_okay=True, file_okay=True)) @cli_options.OPTION_VERBOSITY def register(ctx, path, verbosity='NOTSET'): """Register discovery metadata"""