mapchete-eo 2025.11.0__py2.py3-none-any.whl → 2026.1.0__py2.py3-none-any.whl

mapchete_eo/__init__.py

@@ -1 +1 @@
-__version__ = "2025.11.0"
+__version__ = "2026.1.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/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__)
@@ -53,6 +56,11 @@ class CollectionSearcher(ABC):
     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(
@@ -240,9 +252,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/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

mapchete_eo/search/stac_search.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from datetime import datetime
 from functools import cached_property
-from typing import Any, Dict, Generator, Iterator, List, Optional, Set, Union
+from typing import Any, Dict, Generator, Iterator, List, Optional, Union
 
 from mapchete import Timer
 from mapchete.tile import BufferedTilePyramid
@@ -13,10 +13,8 @@ from pystac_client import Client, CollectionClient, ItemSearch
 from shapely.geometry import shape, box
 from shapely.geometry.base import BaseGeometry
 
-from mapchete_eo.product import blacklist_products
 from mapchete_eo.search.base import CollectionSearcher, StaticCollectionWriterMixin
-from mapchete_eo.search.config import StacSearchConfig
-from mapchete_eo.settings import mapchete_eo_settings
+from mapchete_eo.search.config import StacSearchConfig, patch_invalid_assets
 from mapchete_eo.types import TimeRange
 
 logger = logging.getLogger(__name__)
@@ -24,11 +22,6 @@ logger = logging.getLogger(__name__)
 
 class STACSearchCollection(StaticCollectionWriterMixin, CollectionSearcher):
     collection: str
-    blacklist: Set[str] = (
-        blacklist_products(mapchete_eo_settings.blacklist)
-        if mapchete_eo_settings.blacklist
-        else set()
-    )
     config_cls = StacSearchConfig
 
     @cached_property
@@ -45,18 +38,6 @@ class STACSearchCollection(StaticCollectionWriterMixin, CollectionSearcher):
             logger.debug("cannot find eo:bands definition from collections")
             return []
 
-    @cached_property
-    def id(self) -> str:
-        return self.client.id
-
-    @cached_property
-    def description(self) -> str:
-        return self.client.description
-
-    @cached_property
-    def stac_extensions(self) -> List[str]:
-        return self.client.stac_extensions
-
     def search(
         self,
         time: Optional[Union[TimeRange, List[TimeRange]]] = None,
@@ -138,14 +119,16 @@ class STACSearchCollection(StaticCollectionWriterMixin, CollectionSearcher):
                     query=query,
                 )
 
-        for search in _searches():
-            for item in search.items():
-                if item.get_self_href() in self.blacklist:  # pragma: no cover
-                    logger.debug(
-                        "item %s found in blacklist and skipping", item.get_self_href()
-                    )
-                    continue
-                yield item
+        with patch_invalid_assets():
+            for search in _searches():
+                for item in search.items():
+                    if item.get_self_href() in self.blacklist:  # pragma: no cover
+                        logger.debug(
+                            "item %s found in blacklist and skipping",
+                            item.get_self_href(),
+                        )
+                        continue
+                    yield item
 
     @cached_property
     def default_search_params(self):

mapchete_eo/search/stac_static.py

@@ -65,18 +65,6 @@ class STACStaticCollection(StaticCollectionWriterMixin, CollectionSearcher):
             logger.debug("cannot find eo:bands definition")
             return []
 
-    @cached_property
-    def id(self) -> str:
-        return self.client.id
-
-    @cached_property
-    def description(self) -> str:
-        return self.client.description
-
-    @cached_property
-    def stac_extensions(self) -> List[str]:
-        return self.client.stac_extensions
-
     def search(
         self,
         time: Optional[Union[TimeRange, List[TimeRange]]] = None,

mapchete_eo/search/utm_search.py

@@ -1,19 +1,19 @@
 import datetime
 from functools import cached_property
 import logging
-from typing import Any, Dict, Generator, List, Optional, Set, Union
+from typing import Any, Dict, Generator, List, Optional, Union
 
 from mapchete.io.vector import fiona_open
 from mapchete.path import MPath, MPathLike
 from mapchete.types import Bounds, BoundsLike
 from pystac.collection import Collection
 from pystac.item import Item
+from pystac_client import CollectionClient
 from shapely.errors import GEOSException
 from shapely.geometry import shape
 from shapely.geometry.base import BaseGeometry
 
 from mapchete_eo.exceptions import ItemGeometryError
-from mapchete_eo.product import blacklist_products
 from mapchete_eo.search.base import (
     CollectionSearcher,
     StaticCollectionWriterMixin,
@@ -21,7 +21,6 @@ from mapchete_eo.search.base import (
 )
 from mapchete_eo.search.config import UTMSearchConfig
 from mapchete_eo.search.s2_mgrs import S2Tile, s2_tiles_from_bounds
-from mapchete_eo.settings import mapchete_eo_settings
 from mapchete_eo.time import day_range, to_datetime
 from mapchete_eo.types import TimeRange
 
@@ -29,19 +28,24 @@ logger = logging.getLogger(__name__)
 
 
 class UTMSearchCatalog(StaticCollectionWriterMixin, CollectionSearcher):
-    endpoint: str
-    id: str
-    day_subdir_schema: str
-    stac_json_endswith: str
-    description: str
-    stac_extensions: List[str]
-    blacklist: Set[str] = (
-        blacklist_products(mapchete_eo_settings.blacklist)
-        if mapchete_eo_settings.blacklist
-        else set()
-    )
     config_cls = UTMSearchConfig
 
+    @cached_property
+    def endpoint(self) -> Optional[str]:
+        for collection_properties in self.config.sinergise_aws_collections.values():
+            if collection_properties["id"] == self.collection.split("/")[-1].replace(
+                ".json", ""
+            ):
+                return collection_properties.get("endpoint")
+        return None
+
+    day_subdir_schema: str = "{year}/{month:02d}/{day:02d}"
+    stac_json_endswith: str = "T{tile_id}.json"
+
+    @cached_property
+    def client(self) -> CollectionClient:
+        return next(self.get_collections())
+
     @cached_property
     def eo_bands(self) -> List[str]:  # pragma: no cover
         for (
@@ -85,8 +89,9 @@ class UTMSearchCatalog(StaticCollectionWriterMixin, CollectionSearcher):
         time: Optional[Union[TimeRange, List[TimeRange]]] = None,
         bounds: Optional[Bounds] = None,
         area: Optional[BaseGeometry] = None,
-        config: UTMSearchConfig = UTMSearchConfig(),
+        config: Optional[UTMSearchConfig] = None,
     ) -> Generator[Item, None, None]:
+        config = config or UTMSearchConfig()
         if time is None:
             raise ValueError("time must be given")
         if area is not None and area.is_empty:

{mapchete_eo-2025.11.0.dist-info → mapchete_eo-2026.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapchete-eo
-Version: 2025.11.0
+Version: 2026.1.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>
@@ -15,13 +15,13 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
 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
@@ -33,9 +33,9 @@ Provides-Extra: docs
 Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; 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

{mapchete_eo-2025.11.0.dist-info → mapchete_eo-2026.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mapchete_eo/__init__.py,sha256=2E0oLwEHFZUcghiMB3GjI_PKEVs-4pasu50WwMW-H2A,26
+mapchete_eo/__init__.py,sha256=Q2R77nEGEKjxOBz3qMm2JGtkZn-nVFmReBAVH_YeZ4M,25
 mapchete_eo/base.py,sha256=_6wbR9IZBBBdRBbZY4FEQ0uu603C-tMPYK4MGQ5xSYY,21953
 mapchete_eo/blacklist.txt,sha256=6KhBY0jNjXgRpKRvKJoOTswvNUoP56IrIcNeCYnd2qo,17471
 mapchete_eo/eostac.py,sha256=M-EL8y8pPw8H9hb85FPxSl-1FL_kIYOzxsTIhkrbBZY,570
@@ -36,7 +36,7 @@ mapchete_eo/image_operations/filters.py,sha256=sa_Igv0zMIANHLEALVi8mxohZMoSrdQc6
 mapchete_eo/image_operations/linear_normalization.py,sha256=-eQX3WLCUYWUv-um3s1u33rgjAwCz84Ht8gcPsMWtJE,2468
 mapchete_eo/image_operations/sigmoidal.py,sha256=IKU8F89HhQJWGUVmIrnkuhqzn_ztlGrTf8xXZaVQWzU,3575
 mapchete_eo/io/__init__.py,sha256=1-1g4cESZZREvyumEUABZhDwgVuSxtxdqbNlLuVKlow,950
-mapchete_eo/io/assets.py,sha256=E7phBOu8JaqyRhuEwl7wnmWHvG1yY1sw38QaMCuYkB4,16998
+mapchete_eo/io/assets.py,sha256=OVXLxrwCCUa6frP-xpm2CL30MR8eMABnwVD6EpN1cqU,17215
 mapchete_eo/io/items.py,sha256=5H2xWAyLptDuuHh0rjY1MXReJomV0XBZgMr_rpdpYXU,6244
 mapchete_eo/io/levelled_cubes.py,sha256=ZF7BLn9MHnJCCDjAoR9D7MNbHdusjJ9EACdM7rKNlyM,9018
 mapchete_eo/io/path.py,sha256=fCjvowd9rGJbGio5Z-jDLxa49M2BVurYM9hJy53Im48,4831
@@ -76,14 +76,14 @@ mapchete_eo/processes/dtype_scale.py,sha256=7hJlIe2DsE6Kmk1c3PLwLr8rnn_4_9S6Cz7b
 mapchete_eo/processes/eo_to_xarray.py,sha256=Gcp4qju2C9S8KeUnVY5f3nAsrdckPhGRguzsgRtWBFs,514
 mapchete_eo/processes/merge_rasters.py,sha256=jSXUI8pEWXbQWrM9iMtrH4ACH2VkCaBUH9CQg4z6zLA,8486
 mapchete_eo/search/__init__.py,sha256=bHvaqoHrtoNyO8_3kyJfvhh1yCz0hYvU2fzXhjOXNhU,528
-mapchete_eo/search/base.py,sha256=Xdhq7js96erhV5qgAeKviUakF4qJmzUkbvprrTCP6Zc,9107
-mapchete_eo/search/config.py,sha256=-3TzCBzjTIkCVpuoJMDDShHh4rm_9_QFKYruedEwbjY,2241
+mapchete_eo/search/base.py,sha256=B8vlwgvDYRqxHre5aYWfPZ0tmUic-mb1VBnzl0llUSQ,9757
+mapchete_eo/search/config.py,sha256=L3DBEuKNGh_WXi8_Ha-qj6HW9ksRioYeFyPYGGN09qA,3696
 mapchete_eo/search/s2_mgrs.py,sha256=x12m-tJZNc41lFHNR2h7eSyEZ-ceBO4Gdz785btcVN8,10859
-mapchete_eo/search/stac_search.py,sha256=p38veJiUZtEzXq7KJJ0YzqeEG1L87Q3CLdPIME1RQ3A,10504
-mapchete_eo/search/stac_static.py,sha256=nPvJPayImPHkjVr4XEDp7ucOOhbDpUTlGyMJeaRFmAI,7260
-mapchete_eo/search/utm_search.py,sha256=6T9HtbgT8mrWjzX_7_fkggmQBCWDBhf5i7BJ9dk6BZw,9230
-mapchete_eo-2025.11.0.dist-info/METADATA,sha256=TkqXdAgVkEPhNiAbMS4VSXUwuhKGnITHET5MyvgGwDQ,3257
-mapchete_eo-2025.11.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-mapchete_eo-2025.11.0.dist-info/entry_points.txt,sha256=edU29CA3j8hwBafEd6jO2Zcou1sGkyjNro-y4_LnAnw,320
-mapchete_eo-2025.11.0.dist-info/licenses/LICENSE,sha256=TC5JwvBnFrUgsSQSCDFPc3cqlbth2N0q8MWrhY1EVd0,1089
-mapchete_eo-2025.11.0.dist-info/RECORD,,
+mapchete_eo/search/stac_search.py,sha256=gWMSmDaXZTfH_GV1YiQ8ThbnJYsxHB2j_y_SgMX41Bg,10079
+mapchete_eo/search/stac_static.py,sha256=e53nKu8QRmanGvPmrvIDavHXm8v_4aT5V-wvU8wnkiw,6979
+mapchete_eo/search/utm_search.py,sha256=ZbNJCf461H_709Bpqzuwiu4_iwXC4M-wkemxXKmGenk,9489
+mapchete_eo-2026.1.0.dist-info/METADATA,sha256=0qagoc1eCiRIjxn78e_jJIieQkjV018I_0ylh-1leQQ,3262
+mapchete_eo-2026.1.0.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+mapchete_eo-2026.1.0.dist-info/entry_points.txt,sha256=edU29CA3j8hwBafEd6jO2Zcou1sGkyjNro-y4_LnAnw,320
+mapchete_eo-2026.1.0.dist-info/licenses/LICENSE,sha256=gmZNf2EjyzaNbUyhfsBJlS0yQeG7GEmd-29miNXtEwA,1089
+mapchete_eo-2026.1.0.dist-info/RECORD,,

{mapchete_eo-2025.11.0.dist-info → mapchete_eo-2026.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

{mapchete_eo-2025.11.0.dist-info → mapchete_eo-2026.1.0.dist-info}/licenses/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