ready for review

Author: konstntokas

CHANGES.md

@@ -1,3 +1,9 @@
+## Changes in 0.3.2
+
+- Improved logging output when `visualize` is disabled in the configuration.
+- Updated dependency versions for the xcube data store plugins.
+
+
 ## Changes in 0.3.1
 
 - Use `xcube_resampling.gridmapping.GridMapping.regular_from_bbox` to create a 

environment.yml

@@ -13,14 +13,14 @@ dependencies:
   - tabulate
   - xarray
   - xcube >=1.13.1
-  - xcube-resampling >=0.3.1
+  - xcube-resampling >=0.3.2
   - yaml
   # data store plugins
-  - xcube-cci >=0.12.1
+  - xcube-cci >=0.13
   - xcube-cds >=1.2.0
-  - xcube-clms >=0.2.2
-  - xcube-stac >=1.2.0
-  - xcube-zenodo >=1.1.1
+  - xcube-clms >=1.3.0
+  - xcube-stac >=1.2.2
+  - xcube-zenodo >=1.2.0
   # Development Dependencies - Tools
   - black
   - isort

test/test_multistore.py

@@ -229,7 +229,10 @@ def test_generate_no_visualization(self):
             msds.generate()
         self.assertIsInstance(msds, MultiSourceDataStore)
         self.assertEqual(4, len(cm.output))
-        msg = "INFO:xcube.multistore:Dataset 'dataset1' finished:"
+        msg = (
+            "INFO:xcube.multistore:Data ID: dataset1; Status: COMPLETED; "
+            "Message: Dataset 'dataset1' finished"
+        )
         self.assertIn(msg, str(cm.output[-1]))
         ds = msds.stores.storage.open_data("dataset1.nc")
         self.assertIsInstance(ds, xr.Dataset)
@@ -299,7 +302,10 @@ def test_generate_preload(self):
         self.assertEqual(3, len(cm.output))
         msg = "INFO:xcube.multistore:Data ID 'andorra.zip' already preloaded."
         self.assertEqual(msg, str(cm.output[1]))
-        msg = "INFO:xcube.multistore:Dataset 'senf_andorra' already generated."
+        msg = (
+            "INFO:xcube.multistore:Data ID: senf_andorra; Status: COMPLETED; "
+            "Message: Dataset 'senf_andorra' already generated."
+        )
         self.assertEqual(msg, str(cm.output[2]))
         ds = msds.stores.storage.open_data("senf_andorra.zarr")
         self.assertIsInstance(ds, xr.Dataset)
@@ -357,7 +363,7 @@ def test_generate_error_process_dataset(self):
             msds.generate()
         self.assertIsInstance(msds, MultiSourceDataStore)
         self.assertEqual(3, len(cm.output))
-        self.assertIn("ERROR:xcube.multistore:An error occurred:", str(cm.output[-1]))
+        self.assertIn("ERROR:xcube.multistore:Data ID: dataset1", str(cm.output[-1]))
         self.assertIn("KeyError: 'grid1'", str(cm.output[-1]))
 
     def test_generate_error_write_dataset(self):
@@ -368,7 +374,7 @@ def test_generate_error_write_dataset(self):
             msds.generate()
         self.assertIsInstance(msds, MultiSourceDataStore)
         self.assertEqual(4, len(cm.output))
-        self.assertIn("ERROR:xcube.multistore:An error occurred: ", str(cm.output[-1]))
+        self.assertIn("ERROR:xcube.multistore:Data ID: dataset1", str(cm.output[-1]))
         self.assertIn(
             "AttributeError: 'ZenodoDataStore' object has no attribute 'write_data'",
             str(cm.output[-1]),

xcube_multistore/multistore.py

@@ -439,9 +439,19 @@ def _notify(self, event: GeneratorState):
             self._display.update()
         else:
             if event.status == GeneratorStatus.failed:
-                LOG.error("An error occurred: %s", event.exception)
+                LOG.error(
+                    "Data ID: %s; Status: %s; Exception: %s",
+                    event.identifier,
+                    event.status,
+                    event.exception,
+                )
             else:
-                LOG.info(event.message)
+                LOG.info(
+                    "Data ID: %s; Status: %s; Message: %s",
+                    event.identifier,
+                    event.status,
+                    event.message,
+                )
 
     def _notify_error(self, identifier: str, exception: Any):
         self._notify(

xcube_multistore/version.py

@@ -19,4 +19,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"