cubexpress 0.1.12__tar.gz → 0.1.13__tar.gz

{cubexpress-0.1.12 → cubexpress-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cubexpress
-Version: 0.1.12
+Version: 0.1.13
 Summary: Efficient processing of cubic Earth-observation (EO) data.
 Home-page: https://github.com/andesdatacube/cubexpress
 Keywords: earth-engine,sentinel-2,geospatial,eo,cube

{cubexpress-0.1.12 → cubexpress-0.1.13}/cubexpress/__init__.py

@@ -3,11 +3,9 @@ from cubexpress.geotyping import RasterTransform, Request, RequestSet, Geotransf
 from cubexpress.cloud_utils import s2_table
 from cubexpress.cube import get_cube
 from cubexpress.request import table_to_requestset
+import importlib.metadata
 
 
-
-# pyproj
-# Export the functions
 __all__ = [
     "lonlat2rt",
     "RasterTransform",
@@ -19,8 +17,4 @@ __all__ = [
     "s2_table",
     "table_to_requestset"
 ]
-
-# # Dynamic version import
-# import importlib.metadata
-
 # __version__ = importlib.metadata.version("cubexpress")

{cubexpress-0.1.12 → cubexpress-0.1.13}/cubexpress/cloud_utils.py

@@ -63,6 +63,7 @@ def _cloud_table_single_range(
         .filterBounds(roi)
         .filterDate(start, end)
     )
+
     ic = (
         s2
         .linkCollection(
@@ -71,6 +72,7 @@ def _cloud_table_single_range(
         )
         .select(["cs_cdf"])
     )
+       
     ids_inside = (
         ic                              
         .map(                           
@@ -103,7 +105,9 @@ def _cloud_table_single_range(
             date=lambda d: pd.to_datetime(d["id"].str[:8], format="%Y%m%d").dt.strftime("%Y-%m-%d")
         )
     )
+    
     df_raw["inside"] = df_raw["id"].isin(set(ids_inside)).astype(int)
+    
     df_raw['cs_cdf'] = df_raw.groupby('date').apply(
         lambda group: group['cs_cdf'].transform(
             lambda _: group[group['inside'] == 1]['cs_cdf'].iloc[0] 
@@ -111,7 +115,7 @@ def _cloud_table_single_range(
             else group['cs_cdf'].mean()
         )
     ).reset_index(drop=True)
-    
+
     return df_raw
     
 def s2_table(

{cubexpress-0.1.12 → cubexpress-0.1.13}/cubexpress/cube.py

@@ -93,7 +93,13 @@ def get_cube(
                 nworks=nworks
             ): row.id for _, row in dataframe.iterrows()
         }
-        for future in tqdm(as_completed(futures), total=len(futures)):
+        for future in tqdm(
+            as_completed(futures), 
+            total=len(futures),
+            desc="Downloading images",
+            unit="image",
+            leave=True
+        ):
             try:
                 future.result()
             except Exception as exc:

{cubexpress-0.1.12 → cubexpress-0.1.13}/cubexpress/geotyping.py

@@ -301,8 +301,6 @@ class RequestSet(BaseModel):
                             "crsCode": meta.raster_transform.crs,
                         },
                     },
-                    # "cs_cdf": int(meta.id.split("_")[-1]) / 100,
-                    # "date": meta.id.split("_")[0],
                     "outname": f"{meta.id}.tif",
                 }
                 
@@ -423,18 +421,16 @@ class RequestSet(BaseModel):
     def validate_metadata(self) -> RequestSet:
         """
         Validates that all entries have consistent and valid CRS formats.
-
+        
         Returns:
             RasterTransformSet: The validated instance.
 
         Raises:
             ValueError: If any CRS is invalid or inconsistent.
         """
-        # 1. Pre-consistency validation (CRS, IDs, etc.)
         crs_set: Set[str] = {meta.raster_transform.crs for meta in self.requestset}
         validated_crs: Set[str] = set()
 
-        # Validate CRS formats
         for crs in crs_set:
             if crs not in validated_crs:
                 try:
@@ -443,16 +439,11 @@ class RequestSet(BaseModel):
                 except Exception as e:
                     raise ValueError(f"Invalid CRS format: {crs}") from e
 
-        # Validate ids, they must be unique
         ids = {meta.id for meta in self.requestset}
         if len(ids) != len(self.requestset):
             raise ValueError("All entries must have unique IDs")
 
-        # Upgrade same_coordinates to True if all coordinates are the same
-        # 2. We create the dataframe
         self._dataframe = self.create_manifests()
-        
-        # 3. We validate the structure of the dataframe
         self._validate_dataframe_schema()
 
         return self

{cubexpress-0.1.12 → cubexpress-0.1.13}/cubexpress/request.py

@@ -35,7 +35,7 @@ def table_to_requestset(
     df = table.copy()
 
     if df.empty:
-        raise ValueError("There are no images in the requested period. Please check your dates or your ubication.")
+        raise ValueError("There are no images in the requested period. Please check your dates, ubication or cloud coverage.")
 
     rt = lonlat2rt(
         lon=df.attrs["lon"],
@@ -86,10 +86,8 @@ def table_to_requestset(
                 )
             else:
                 for img_id in img_ids:
-                    # tile = img_id.split("_")[-1][1:]
                     reqs.append(
                         Request(
-                            # id=f"{day}_{centre_hash}_{tile}_{cdf}",
                             id=f"{day}_{centre_hash}_{cdf}",
                             raster_transform=rt,
                             image=f"{df.attrs['collection']}/{img_id}",

{cubexpress-0.1.12 → cubexpress-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "cubexpress"
-version     = "0.1.12"
+version     = "0.1.13"
 description = "Efficient processing of cubic Earth-observation (EO) data."
 authors     = [
   "Julio Contreras <contrerasnetk@gmail.com>",