From f3e72d02cbb49073187b89a67245743fcde35fca Mon Sep 17 00:00:00 2001 From: dwest77a Date: Tue, 24 Jun 2025 11:17:57 +0100 Subject: [PATCH] Updated warning message on unreachable, fixed bug with variable query --- ceda_datapoint/core/cloud.py | 8 ++++++-- ceda_datapoint/core/item.py | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ceda_datapoint/core/cloud.py b/ceda_datapoint/core/cloud.py index b33d2e1..ecd300d 100644 --- a/ceda_datapoint/core/cloud.py +++ b/ceda_datapoint/core/cloud.py @@ -326,8 +326,12 @@ def _prepare_dataset( datetime = self._meta['search_terms'].get('datetime',None) # Datetime can only be applied to 'time' dimension. - query = self._meta['search_terms'].get('query',{}) - vq = query.get('variables',None) + query = self._meta['search_terms'].get('query',[]) + + vq = None + for ql in query: + if 'variables' in ql: + vq = ql.split('=')[-1] variables = self._data_selection.get('variables',None) or vq sel = self._data_selection.get('sel',None) diff --git a/ceda_datapoint/core/item.py b/ceda_datapoint/core/item.py index cb0220c..b78fd84 100644 --- a/ceda_datapoint/core/item.py +++ b/ceda_datapoint/core/item.py @@ -364,6 +364,13 @@ def _load_cloud_assets( mapper=mapper, data_selection=self._data_selection) if show_unreachable or a.visibility != 'unreachable': asset_list.append(a) + else: + if a.visibility == 'unreachable': + logger.warning( + f'Dataset for {self._id} not reachable - use ' + 'show_unreachable=True in search.collect_cloud_assets() ' + 'to obtain the product object.' + ) if len(asset_list) == 0: