From 121838b4c1b16ae81c86c7fabae0dfa2e338e892 Mon Sep 17 00:00:00 2001 From: burnout87 Date: Tue, 17 Oct 2023 16:45:36 +0200 Subject: [PATCH] no return_progress for data_server_query --- cdci_data_analysis/analysis/queries.py | 11 ++++------- .../plugins/dummy_plugin/data_server_dispatcher.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cdci_data_analysis/analysis/queries.py b/cdci_data_analysis/analysis/queries.py index 5af9ce2ce..7285cd61e 100644 --- a/cdci_data_analysis/analysis/queries.py +++ b/cdci_data_analysis/analysis/queries.py @@ -526,7 +526,7 @@ def test_has_products(self,instrument,job=None,query_type='Real',logger=None,con return query_out - def get_query_products(self,instrument,job,run_asynch,query_type='Real',logger=None,config=None,scratch_dir=None,sentry_dsn=None,api=False,return_progress=False): + def get_query_products(self,instrument,job,run_asynch,query_type='Real',logger=None,config=None,scratch_dir=None,sentry_dsn=None,api=False): if logger is None: logger = self.get_logger() @@ -547,8 +547,7 @@ def get_query_products(self,instrument,job,run_asynch,query_type='Real',logger=N res, data_server_query_out = q.run_query(call_back_url=job.get_call_back_url(), run_asynch=run_asynch, - logger=logger, - return_progress=return_progress) + logger=logger) for field in ['message', 'debug_message', 'comment', 'warning']: if field in data_server_query_out.status_dictionary.keys(): @@ -576,8 +575,7 @@ def get_query_products(self,instrument,job,run_asynch,query_type='Real',logger=N self.query_prod_list = self.get_dummy_products(instrument, config=config, out_dir=scratch_dir, - api=api, - return_progress=return_progress) + api=api) #self.query_prod_list = QueryProductList(prod_list=prod_list) @@ -716,8 +714,7 @@ def run_query(self, config=config, scratch_dir=scratch_dir, sentry_dsn=sentry_dsn, - api=api, - return_progress=return_progress) + api=api) self._t_query_steps['after_get_query_products'] = _time.time() if query_out.status_dictionary['status'] == 0: diff --git a/cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py b/cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py index fcac5cb70..92b8d4947 100644 --- a/cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py +++ b/cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py @@ -164,7 +164,7 @@ def __init__(self): super().__init__() def run_query(self, *args, **kwargs): - logger.warn('fake run_query in %s with %s, %s', self, args, kwargs) + logger.info(f'fake run_query that can return progress in {self} with {args} and {kwargs}') query_out = QueryOutput()