Fixes for soil moisture monthly / 10-day requests

Addresses Issue #48.

Several soil moisture tests currently failing -- they will have to be
updated for compatibility with the changed request format.

Author: pont-us

README.md

@@ -34,7 +34,6 @@ of use for any datasets you want to acccess.
 
 #### Obtain a CDS API key
 
-
 You can obtain the UID and API key as follows:
 
 1. Create a user account on the

test/test_soil_moisture.py

@@ -55,7 +55,25 @@ def test_soil_moisture_volumetric_minimal_params(self):
                          dataset.attrs['time_coverage_end'])
         description = store.describe_data(data_id)
         self.assertCountEqual(description.data_vars.keys(),
-                         map(str, dataset.data_vars))
+                              map(str, dataset.data_vars))
+
+    def test_soil_moisture_volumetric_monthly_2_years(self):
+        store = CDSDataStore()
+        data_id = 'satellite-soil-moisture:volumetric:monthly'
+        dataset = store.open_data(
+            data_id,
+            time_range=['2015-01-01', '2016-12-31'],
+            type_of_record='cdr'
+        )
+        self.assertTrue('sm' in dataset.variables)
+        self.assertEqual(2, len(dataset.variables['time']))
+        self.assertEqual('2014-12-31T12:00:00Z',
+                         dataset.attrs['time_coverage_start'])
+        self.assertEqual('2017-01-01T12:00:00Z',
+                         dataset.attrs['time_coverage_end'])
+        description = store.describe_data(data_id)
+        self.assertCountEqual(description.data_vars.keys(),
+                              map(str, dataset.data_vars))
 
     def test_soil_moisture_saturation_daily(self):
         store = CDSDataStore(client_class=CDSClientMock,

xcube_cds/datasets/reanalysis_era5.py

@@ -98,9 +98,12 @@ def _read_dataset_info(self):
         # (issue #6) and sometimes with non-increasing time (issue #5), so
         # for now they are blacklisted.
         blacklist = frozenset([
-            'reanalysis-era5-land-monthly-means:monthly_averaged_reanalysis_by_hour_of_day',
-            'reanalysis-era5-single-levels-monthly-means:monthly_averaged_ensemble_members_by_hour_of_day',
-            'reanalysis-era5-single-levels-monthly-means:monthly_averaged_reanalysis_by_hour_of_day'
+            'reanalysis-era5-land-monthly-means:'
+            'monthly_averaged_reanalysis_by_hour_of_day',
+            'reanalysis-era5-single-levels-monthly-means:'
+            'monthly_averaged_ensemble_members_by_hour_of_day',
+            'reanalysis-era5-single-levels-monthly-means:'
+            'monthly_averaged_reanalysis_by_hour_of_day'
         ])
 
         # We use a list rather than a set, since we want to preserve ordering

xcube_cds/datasets/satellite_soil_moisture.py

@@ -115,6 +115,13 @@ def transform_params(self, opener_params, data_id: str) -> \
 
         time_selectors = self.transform_time_params(
             self.convert_time_range(opener_params['time_range']))
+        time_selectors.pop('time', None)
+        if aggregation == 'monthly':
+            time_selectors['day'] = '01'
+        if aggregation == '10-day':
+            time_selectors['day'] =\
+                sorted(set(time_selectors['day'])
+                       .intersection({'01', '11', '21'}))
         cds_params.update(time_selectors)
 
         # Transform singleton list values into their single members, as

xcube_cds/store.py

@@ -770,7 +770,9 @@ def get_data_ids(self, type_specifier: Optional[str] = None,
             for data_id, handler in self._handler_registry.items():
                 if return_tuples:
                     if include_titles:
-                        yield data_id, {'title': handler.get_human_readable_data_id(data_id)}
+                        yield data_id,\
+                              {'title':
+                                   handler.get_human_readable_data_id(data_id)}
                     else:
                         yield data_id, {}
                 else: