mapchete-eo 2025.11.0__tar.gz → 2026.2.0__tar.gz

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/.gitignore

@@ -1,14 +1,18 @@
-.eggs
-*.egg-info
-*.pyc
+build/
 .cache
-htmlcov
 .coverage
 .coverage.*
-build/
 dist/
-.pytest*
+docs/build/html
+*.egg-info
+.eggs
+examples/sentinel-2*/
 *.gfs
-.vscode/
+htmlcov
+.mypy_cache
+*.pyc
 __pycache__
-examples/sentinel-2*/
+.pytest*
+.ruff_cache
+.vscode/
+.venv

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 - 2025 EOX IT Services
+Copyright (c) 2022 - 2026 EOX IT Services
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapchete-eo
-Version: 2025.11.0
+Version: 2026.2.0
 Summary: mapchete EO data reader
 Project-URL: Homepage, https://gitlab.eox.at/maps/mapchete_eo
 Author-email: Joachim Ungar <joachim.ungar@eox.at>, Petr Sevcik <petr.sevcik@eox.at>
@@ -14,14 +14,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
+Requires-Python: >=3.10
 Requires-Dist: click
-Requires-Dist: cql2
 Requires-Dist: croniter
 Requires-Dist: lxml
 Requires-Dist: mapchete[complete]>=2025.10.0
 Requires-Dist: opencv-python-headless
 Requires-Dist: pillow
 Requires-Dist: pydantic
+Requires-Dist: pygeofilter
 Requires-Dist: pystac-client>=0.7.5
 Requires-Dist: pystac[urllib3]>=1.12.2
 Requires-Dist: retry
@@ -30,12 +31,13 @@ Requires-Dist: scipy
 Requires-Dist: tqdm
 Requires-Dist: xarray
 Provides-Extra: docs
-Requires-Dist: sphinx; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme; extra == 'docs'
+Requires-Dist: myst-parser; extra == 'docs'
+Requires-Dist: sphinx-rtd-theme>=3.0.2; extra == 'docs'
+Requires-Dist: sphinx>=8.0; extra == 'docs'
 Provides-Extra: test
+Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-coverage; extra == 'test'
-Requires-Dist: pytest-lazy-fixture; extra == 'test'
-Requires-Dist: pytest<8; extra == 'test'
+Requires-Dist: pytest-lazy-fixtures; extra == 'test'
 Description-Content-Type: text/x-rst
 
 .. image:: logo/mapchete_eo.svg
@@ -80,10 +82,10 @@ You must have ``mapchete`` with ``s3`` installed, so let's grab the ``complete``
 
 .. code-block:: bash
 
-    pip install mapchete[complete]
+    uv pip install mapchete[complete]
 
 Then install mapchete-eo:
 
 .. code-block:: bash
 
-    pip install mapchete-eo
+    uv pip install mapchete-eo

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/README.rst

@@ -40,10 +40,10 @@ You must have ``mapchete`` with ``s3`` installed, so let's grab the ``complete``
 
 .. code-block:: bash
 
-    pip install mapchete[complete]
+    uv pip install mapchete[complete]
 
 Then install mapchete-eo:
 
 .. code-block:: bash
 
-    pip install mapchete-eo
+    uv pip install mapchete-eo

mapchete_eo-2026.2.0/mapchete_eo/__init__.py

@@ -0,0 +1 @@
+__version__ = "2026.2.0"

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/base.py

@@ -44,6 +44,10 @@ logger = logging.getLogger(__name__)
 
 
 class BaseDriverConfig(BaseModel):
+    """
+    Configuration for mapchete-eo drivers.
+    """
+
     format: str
     source: Sequence[Source]
     time: Optional[Union[TimeRange, List[TimeRange]]] = None
@@ -114,6 +118,9 @@ class EODataCube(base.InputTile):
 
     @cached_property
     def products(self) -> IndexedFeatures[EOProductProtocol]:
+        """
+        Indexed products.
+        """
         # during task graph processing, the products have to be fetched as preprocessing task results
         if self._products is None:  # pragma: no cover
             return IndexedFeatures(
@@ -158,11 +165,7 @@ class EODataCube(base.InputTile):
         **kwargs,
     ) -> xr.Dataset:
         """
-        Read reprojected & resampled input data.
-
-        Returns
-        -------
-        data : xarray.Dataset
+        Read input data into an xarray.Dataset.
         """
         return products_to_xarray(
             products=self.filter_products(
@@ -201,6 +204,9 @@ class EODataCube(base.InputTile):
         raise_empty: bool = True,
         **kwargs,
     ) -> ma.MaskedArray:
+        """
+        Read input data as a MaskedArray.
+        """
         return products_to_np_array(
             products=self.filter_products(
                 start_time=start_time,
@@ -286,6 +292,27 @@ class EODataCube(base.InputTile):
         raise_empty: bool = True,
         **kwargs,
     ) -> ma.MaskedArray:
+        """
+        Read levelled data (cubes with depth) as a MaskedArray.
+
+        Args:
+            target_height: Target stack height.
+            assets: List of asset names.
+            eo_bands: List of EO bands.
+            start_time: Start time.
+            end_time: End time.
+            timestamps: List of timestamps.
+            time_pattern: Time pattern.
+            resampling: Resampling method.
+            nodatavals: Nodata values.
+            merge_products_by: Property to merge by.
+            merge_method: Merge method.
+            sort: Sorting configuration.
+            raise_empty: Raise error if no data found.
+
+        Returns:
+            ma.MaskedArray: Output data array.
+        """
         return read_levelled_cube_to_np_array(
             products=self.filter_products(
                 start_time=start_time,
@@ -317,6 +344,19 @@ class EODataCube(base.InputTile):
         nodatavals: NodataVals = None,
         **kwargs,
     ):
+        """
+        Read product masks.
+
+        Args:
+            start_time: Start time.
+            end_time: End time.
+            timestamps: List of timestamps.
+            time_pattern: Time pattern.
+            nodatavals: Nodata values.
+
+        Returns:
+            ma.MaskedArray: Mask data.
+        """
         from mapchete_eo.platforms.sentinel2.masks import read_masks
 
         return read_masks(
@@ -423,6 +463,10 @@ class EODataCube(base.InputTile):
 
 
 class InputData(base.InputData):
+    """
+    Main driver class used by mapchete to handle input data discovery and indexing.
+    """
+
     default_preprocessing_task: Callable = staticmethod(EOProduct.from_stac_item)
     driver_config_model: Type[BaseDriverConfig] = BaseDriverConfig
     params: BaseDriverConfig

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/image_operations/compositing.py

@@ -153,6 +153,18 @@ METHODS = {
 def composite(
     method: str, bg: np.ndarray, fg: np.ndarray, opacity: float = 1
 ) -> ma.MaskedArray:
+    """
+    Composite two image arrays using a named blending method.
+
+    Args:
+        method: Blending method name (e.g., 'multiply', 'screen').
+        bg: Background image array (channels-first).
+        fg: Foreground image array (channels-first).
+        opacity: Opacity of the foreground layer (0-1).
+
+    Returns:
+        ma.MaskedArray: Blended RGBA result.
+    """
     return METHODS[method](bg, fg, opacity)
 
 

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/io/assets.py

@@ -32,7 +32,7 @@ logger = logging.getLogger(__name__)
 
 
 class STACRasterBandProperties(BaseModel):
-    nodata: NodataVal = None
+    nodata: Optional[NodataVal] = None
     data_type: Optional[str] = None
     scale: float = 1.0
     offset: float = 0.0
@@ -40,9 +40,9 @@ class STACRasterBandProperties(BaseModel):
     @staticmethod
     def from_asset(
         asset: pystac.Asset,
-        nodataval: NodataVal = None,
+        nodataval: Optional[NodataVal] = None,
     ) -> STACRasterBandProperties:
-        if asset.extra_fields.get("raster:offset") is not None:
+        if asset.extra_fields.get("raster:offset", {}):
             properties = dict(
                 offset=asset.extra_fields.get("raster:offset"),
                 scale=asset.extra_fields.get("raster:scale"),
@@ -87,16 +87,21 @@ def asset_to_np_array(
     )
 
     logger.debug("reading asset %s and indexes %s ...", asset, indexes)
-    data = read_raster(
+    array = read_raster(
         inp=path,
         indexes=indexes,
         grid=grid,
         resampling=resampling.name,
         dst_nodata=band_properties.nodata,
-    ).data
-
+    ).array
     if apply_offset and band_properties.offset:
-        data_type = band_properties.data_type or data.dtype
+        logger.debug(
+            "apply offset %s and scale %s to asset %s",
+            band_properties.offset,
+            band_properties.scale,
+            asset,
+        )
+        data_type = band_properties.data_type or array.dtype
 
         # determine value range for the target data_type
         clip_min, clip_max = dtype_ranges[str(data_type)]
@@ -105,9 +110,9 @@ def asset_to_np_array(
         if clip_min == band_properties.nodata:
             clip_min += 1
 
-        data[:] = (
+        array[~array.mask] = (
             (
-                ((data * band_properties.scale) + band_properties.offset)
+                ((array[~array.mask] * band_properties.scale) + band_properties.offset)
                 / band_properties.scale
             )
             .round()
@@ -115,8 +120,7 @@ def asset_to_np_array(
             .astype(data_type, copy=False)
             .data
         )
-
-    return data
+    return array
 
 
 def get_assets(

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/platforms/sentinel2/driver.py

@@ -17,6 +17,10 @@ METADATA: dict = {
 
 
 class Sentinel2Cube(base.EODataCube):
+    """
+    Sentinel-2 data cube for Mapchete.
+    """
+
     # Sentinel-2 driver specific default values:
     default_read_merge_method: MergeMethod = MergeMethod.average
     default_read_merge_products_by: Optional[str] = "s2:datastrip_id"
@@ -29,7 +33,7 @@ Sentinel2CubeGroup = List[Tuple[str, Sentinel2Cube]]
 
 class InputData(base.InputData):
     """
-    Main driver class used by mapchete.
+    Sentinel-2 driver for Mapchete.
     """
 
     # Sentinel-2 driver specific parameters:

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/platforms/sentinel2/masks.py

@@ -61,7 +61,9 @@ def masks_to_xarray(
     raise_empty: bool = True,
     product_read_kwargs: dict = {},
 ) -> xr.Dataset:
-    """Read grid window of EOProducts and merge into a 4D xarray."""
+    """
+    Read masks of products and merge into an xarray.Dataset.
+    """
     data_vars = [
         s
         for s in generate_slice_masks_dataarrays(
@@ -307,7 +309,9 @@ def product_masks_to_slices(
     group_by_property: Optional[str] = None,
     sort: Optional[SortMethodConfig] = None,
 ) -> List[Slice]:
-    """Group products per given property into Slice objects and optionally sort slices."""
+    """
+    Group products by a property into Slices and optionally sort.
+    """
     if group_by_property:
         grouped = defaultdict(list)
         for product in products:

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/platforms/sentinel2/preprocessing_tasks.py

@@ -19,7 +19,10 @@ def parse_s2_product(
     cache_config: Optional[CacheConfig] = None,
     cache_all: bool = False,
 ) -> Union[S2Product, CorruptedProductMetadata]:
-    # use mapper from source if applickable
+    """
+    Parse a Sentinel-2 STAC Item into an S2Product.
+    """
+    # use mapper from source if applicable
     source: Union[Sentinel2Source, None] = item.properties.pop(
         "mapchete_eo:source", None
     )

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/platforms/sentinel2/product.py

@@ -143,6 +143,10 @@ class Cache:
 
 
 class S2Product(EOProduct, EOProductProtocol):
+    """
+    Sentinel-2 specific EOProduct implementation.
+    """
+
     _item_dict: Optional[dict] = None
     cache: Optional[Cache] = None
     _scl_cache: Dict[GridProtocol, np.ndarray]
@@ -245,6 +249,9 @@ class S2Product(EOProduct, EOProductProtocol):
         read_mask: Optional[np.ndarray] = None,
         **kwargs,
     ) -> ma.MaskedArray:
+        """
+        Read Sentinel-2 assets into a MaskedArray with masks and BRDF.
+        """
         assets = assets or []
         eo_bands = eo_bands or []
         apply_offset = apply_offset and not self.metadata.boa_offset_applied
@@ -451,7 +458,9 @@ class S2Product(EOProduct, EOProductProtocol):
         grid: Union[GridProtocol, Resolution] = Resolution["20m"],
         cached_read: bool = False,
     ) -> ReferencedRaster:
-        """Return SCL mask."""
+        """
+        Read Scene Classification Layer mask.
+        """
         grid = (
             self.metadata.grid(grid)
             if isinstance(grid, Resolution)
@@ -519,7 +528,9 @@ class S2Product(EOProduct, EOProductProtocol):
         mask_config: MaskConfig = MaskConfig(),
         target_mask: Optional[np.ndarray] = None,
     ) -> ReferencedRaster:
-        """Merge masks into one 2D array."""
+        """
+        Merge all configured masks into one.
+        """
         grid = (
             self.metadata.grid(grid)
             if isinstance(grid, Resolution)
@@ -619,6 +630,8 @@ class S2Product(EOProduct, EOProductProtocol):
             logger.debug(
                 "mask for product %s already full, skip reading other masks", self.id
             )
+        except FileNotFoundError as exc:  # pragma: no cover
+            raise CorruptedProduct from exc
 
         # ATTENTION: target_mask and out have to be combined *after* mask was buffered!
         # use 'logical or' not '+' !!!

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/product.py

@@ -26,7 +26,9 @@ logger = logging.getLogger(__name__)
 
 
 class EOProduct(EOProductProtocol):
-    """Wrapper class around a Item which provides read functions."""
+    """
+    Wrapper class around a STAC Item which provides data reading capabilities.
+    """
 
     id: str
     default_dtype: DTypeLike = np.uint16
@@ -70,7 +72,22 @@ class EOProduct(EOProductProtocol):
         raise_empty: bool = True,
         **kwargs,
     ) -> xr.Dataset:
-        """Read bands and assets into xarray."""
+        """
+        Read bands and assets into an xarray.Dataset.
+
+        Args:
+            assets: List of asset names.
+            eo_bands: List of EO band names.
+            grid: Target grid protocol.
+            resampling: Resampling algorithm.
+            nodatavals: Custom nodata values.
+            x_axis_name: Name of X axis in output.
+            y_axis_name: Name of Y axis in output.
+            raise_empty: Raise exception if no data is found.
+
+        Returns:
+            xr.Dataset: Dataset with assets as data variables.
+        """
         # developer info: all fancy stuff for special platforms like Sentinel-2
         # should be implemented in the respective read_np_array() methods which get
         # called by this method. No need to apply masks etc. here too.
@@ -121,6 +138,21 @@ class EOProduct(EOProductProtocol):
         apply_offset: bool = True,
         **kwargs,
     ) -> ma.MaskedArray:
+        """
+        Read assets or EO bands into a MaskedArray.
+
+        Args:
+            assets: List of asset names.
+            eo_bands: List of EO band names.
+            grid: Target grid.
+            resampling: Resampling method.
+            nodatavals: Nodata values.
+            raise_empty: Raise if empty.
+            apply_offset: Apply offset/scale metadata if present.
+
+        Returns:
+            ma.MaskedArray: Output array.
+        """
         assets = assets or []
         eo_bands = eo_bands or []
         bands = assets or eo_bands
@@ -182,7 +214,15 @@ def eo_bands_to_band_locations(
     role: Literal["data", "reflectance", "visual"] = "data",
 ) -> List[BandLocation]:
     """
-    Find out location (asset and band index) of EO band.
+    Map EO band names to asset locations.
+
+    Args:
+        item: STAC Item.
+        eo_bands: List of common band names.
+        role: Functional role of the assets.
+
+    Returns:
+        List[BandLocation]: List of location objects.
     """
     return [find_eo_band(item, eo_band, role=role) for eo_band in eo_bands]
 

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/search/base.py

@@ -2,9 +2,10 @@ from functools import cached_property
 import json
 import logging
 from abc import ABC, abstractmethod
-from typing import Any, Callable, Dict, Generator, List, Optional, Type, Union
+from typing import Any, Callable, Dict, Generator, List, Optional, Set, Type, Union
 
-from cql2 import Expr
+from pygeofilter.parsers.ecql import parse as parse_ecql
+from pygeofilter.backends.native.evaluate import NativeEvaluator
 from pydantic import BaseModel
 from mapchete.path import MPath, MPathLike
 from mapchete.types import Bounds
@@ -17,6 +18,8 @@ from rasterio.profiles import Profile
 from shapely.geometry.base import BaseGeometry
 
 from mapchete_eo.io.assets import get_assets, get_metadata_assets
+from mapchete_eo.product import blacklist_products
+from mapchete_eo.settings import mapchete_eo_settings
 from mapchete_eo.types import TimeRange
 
 logger = logging.getLogger(__name__)
@@ -47,12 +50,17 @@ class FSSpecStacIO(StacApiIO):
 
 class CollectionSearcher(ABC):
     """
-    This class serves as a bridge between an Archive and a catalog implementation.
+    Bridge between a Source and a catalog implementation.
     """
 
     config_cls: Type[BaseModel]
     collection: str
     stac_item_modifiers: Optional[List[Callable[[Item], Item]]] = None
+    blacklist: Set[str] = (
+        blacklist_products(mapchete_eo_settings.blacklist)
+        if mapchete_eo_settings.blacklist
+        else set()
+    )
 
     def __init__(
         self,
@@ -70,17 +78,21 @@ class CollectionSearcher(ABC):
     @cached_property
     def eo_bands(self) -> List[str]: ...
 
-    @abstractmethod
+    @property
+    def config(self) -> BaseModel:
+        return self.config_cls()
+
     @cached_property
-    def id(self) -> str: ...
+    def id(self) -> str:
+        return self.client.id
 
-    @abstractmethod
     @cached_property
-    def description(self) -> str: ...
+    def description(self) -> str:
+        return self.client.description
 
-    @abstractmethod
     @cached_property
-    def stac_extensions(self) -> List[str]: ...
+    def stac_extensions(self) -> List[str]:
+        return self.client.stac_extensions
 
     @abstractmethod
     def search(
@@ -117,7 +129,29 @@ class StaticCollectionWriterMixin(CollectionSearcher):
         stac_io: DefaultStacIO = FSSpecStacIO(),
         progress_callback: Optional[Callable] = None,
     ) -> MPath:
-        """Dump static version of current items."""
+        """
+        Export a static STAC catalog from the search results.
+
+        Args:
+            output_path: Destination directory for the static catalog.
+            bounds: Spatial filter bounds.
+            area: Spatial filter geometry.
+            time: Temporal filter range.
+            search_kwargs: Additional search arguments.
+            name: Catalog name.
+            description: Catalog description.
+            assets: List of assets to download.
+            assets_dst_resolution: Sub-sampling resolution for assets.
+            assets_convert_profile: Output profile for assets (e.g. for COG conversion).
+            copy_metadata: Whether to copy sidecar metadata files.
+            metadata_parser_classes: Custom parser classes for metadata.
+            overwrite: Overwrite existing files.
+            stac_io: Custom STAC IO implementation.
+            progress_callback: Optional function for progress reporting.
+
+        Returns:
+            MPath: Path to the generated catalog.json.
+        """
         output_path = MPath.from_inp(output_path)
         assets = assets or []
         # initialize catalog
@@ -240,9 +274,12 @@ def filter_items(
     and passed down to the individual search approaches via said config and this Function.
     """
     if query:
-        expr = Expr(query)
+        ast = parse_ecql(query)
+        evaluator = NativeEvaluator(use_getattr=False)
+        filter_func = evaluator.evaluate(ast)
         for item in items:
-            if expr.matches(item.properties):
+            # pystac items store metadata in 'properties'
+            if filter_func(item.properties):
                 yield item
     else:
         yield from items

{mapchete_eo-2025.11.0 → mapchete_eo-2026.2.0}/mapchete_eo/search/config.py

@@ -1,3 +1,7 @@
+import logging
+
+
+from contextlib import contextmanager
 from typing import Optional, Dict, Any
 
 from mapchete.path import MPath, MPathLike
@@ -46,18 +50,64 @@ class UTMSearchConfig(BaseModel):
             path=MPath(
                 "https://sentinel-s2-l2a-stac.s3.amazonaws.com/sentinel-s2-l2a.json"
             ),
+            endpoint="s3://sentinel-s2-l2a-stac",
         ),
         S2_L1C=dict(
             id="sentinel-s2-l1c",
             path=MPath(
                 "https://sentinel-s2-l1c-stac.s3.amazonaws.com/sentinel-s2-l1c.json"
             ),
+            endpoint="s3://sentinel-s2-l1c-stac",
         ),
         S1_GRD=dict(
             id="sentinel-s1-l1c",
             path=MPath(
                 "https://sentinel-s1-l1c-stac.s3.amazonaws.com/sentinel-s1-l1c.json"
             ),
+            endpoint="s3://sentinel-s1-l1c-stac",
         ),
     )
     search_index: Optional[MPathLike] = None
+
+
+@contextmanager
+def patch_invalid_assets():
+    """
+    Context manager/decorator to fix pystac crash on malformed assets (strings instead of dicts).
+
+    """
+    try:
+        from pystac.extensions.file import FileExtensionHooks
+    except ImportError:  # pragma: no cover
+        yield
+        return
+
+    logger = logging.getLogger(__name__)
+
+    _original_migrate = FileExtensionHooks.migrate
+
+    def _safe_migrate(self, obj, version, info):
+        if "assets" in obj and isinstance(obj["assets"], dict):
+            bad_keys = []
+            for key, asset in obj["assets"].items():
+                if not isinstance(asset, dict):
+                    logger.debug(
+                        "Removing malformed asset '%s' (type %s) from item %s",
+                        key,
+                        type(asset),
+                        obj.get("id", "unknown"),
+                    )
+                    bad_keys.append(key)
+
+            for key in bad_keys:
+                del obj["assets"][key]
+
+        return _original_migrate(self, obj, version, info)
+
+    # Apply patch
+    FileExtensionHooks.migrate = _safe_migrate
+    try:
+        yield
+    finally:
+        # Restore original
+        FileExtensionHooks.migrate = _original_migrate