Skip to content

Commit

Permalink
no return_progress for data_server_query
Browse files Browse the repository at this point in the history
  • Loading branch information
burnout87 committed Oct 17, 2023
1 parent 405f326 commit 121838b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
11 changes: 4 additions & 7 deletions cdci_data_analysis/analysis/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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():
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def __init__(self):
super().__init__()

Check warning on line 164 in cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py

View check run for this annotation

Codecov / codecov/patch

cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py#L164

Added line #L164 was not covered by tests

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}')

Check warning on line 167 in cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py

View check run for this annotation

Codecov / codecov/patch

cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py#L167

Added line #L167 was not covered by tests

query_out = QueryOutput()

Check warning on line 169 in cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py

View check run for this annotation

Codecov / codecov/patch

cdci_data_analysis/plugins/dummy_plugin/data_server_dispatcher.py#L169

Added line #L169 was not covered by tests

Expand Down

0 comments on commit 121838b

Please sign in to comment.