glam-processing 0.4.2__tar.gz → 0.4.4__tar.gz

{glam_processing-0.4.2 → glam_processing-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glam-processing
-Version: 0.4.2
+Version: 0.4.4
 Summary: 
 Author: John Keniston
 Author-email: jfkeniston@gmail.com

{glam_processing-0.4.2 → glam_processing-0.4.4}/glam_processing/download.py

@@ -42,6 +42,7 @@ from . import exceptions
 logging.basicConfig(
     format="%(asctime)s - %(message)s",
     datefmt="%d-%b-%y %H:%M:%S",
+    level=logging.INFO,
 )
 log = logging.getLogger(__name__)
 
@@ -184,24 +185,33 @@ class EarthDataDownloader(GlamDownloader):
         return granules
 
     def query_composites(self, start_date, end_date):
-        granules = self.query_granules(start_date, end_date)
         composites = []
-        for granule in tqdm(granules, desc="Getting available composite dates"):
-            composite_obj = {}
-            composite_obj["id"] = (
-                granule["meta"]["native-id"].split(".")[0]
-                + "."
-                + granule["meta"]["native-id"].split(".")[1]
+        try:
+            granules = self.query_granules(start_date, end_date)
+            assert (
+                len(granules) > 275
+            )  # ensure we have enough granules to create a composite
+            # todo: product specific granule check
+            for granule in tqdm(granules, desc="Getting available composite dates"):
+                composite_obj = {}
+                composite_obj["id"] = (
+                    granule["meta"]["native-id"].split(".")[0]
+                    + "."
+                    + granule["meta"]["native-id"].split(".")[1]
+                )
+                composite_obj["start_date"] = granule["umm"]["TemporalExtent"][
+                    "RangeDateTime"
+                ]["BeginningDateTime"][:10]
+                composite_obj["end_date"] = granule["umm"]["TemporalExtent"][
+                    "RangeDateTime"
+                ]["EndingDateTime"][:10]
+                if composite_obj not in composites:
+                    composites.append(composite_obj)
+        except AssertionError:
+            log.info(
+                f"Insufficient granules found to create a composite for {self.dataset}."
             )
-            composite_obj["start_date"] = granule["umm"]["TemporalExtent"][
-                "RangeDateTime"
-            ]["BeginningDateTime"][:10]
-            composite_obj["end_date"] = granule["umm"]["TemporalExtent"][
-                "RangeDateTime"
-            ]["EndingDateTime"][:10]
-            if composite_obj not in composites:
-                composites.append(composite_obj)
-
+            return composites
         return composites
 
     def download_granules(self, start_date, end_date, out_dir):
@@ -277,8 +287,14 @@ class EarthDataDownloader(GlamDownloader):
                 composite["start_date"], composite["end_date"], out, vi=vi
             )
 
+            log.debug(f"downloaded files: {len(vi_files)}")
+
+            # filter files to ensure they belong in this composite
+            composite_files = [file for file in vi_files if composite["id"] in file]
+            log.debug(f"filtered files: {len(composite_files)}")
+
             vi_mosaic = self._create_mosaic_cog_from_tifs(
-                composite["start_date"], vi_files, out
+                composite["start_date"], composite_files, out
             )
             # Remove tiffs after mosaic creation.
             for file in vi_files:

{glam_processing-0.4.2 → glam_processing-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "glam-processing"
-version = "0.4.2"
+version = "0.4.4"
 description = ""
 authors = ["John Keniston <jfkeniston@gmail.com>"]
 readme = "README.md"