sentinelhub 3.10.1__tar.gz → 3.10.3__tar.gz

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: sentinelhub
-Version: 3.10.1
+Version: 3.10.3
 Summary: Python API for Sentinel Hub
 Project-URL: Homepage, https://github.com/sentinel-hub/sentinelhub-py
 Project-URL: Documentation, https://sentinelhub-py.readthedocs.io
@@ -73,14 +73,13 @@ Requires-Dist: boto3-stubs>=1.20.0; extra == 'dev'
 Requires-Dist: build; extra == 'dev'
 Requires-Dist: click>=8.0.0; extra == 'dev'
 Requires-Dist: fs; extra == 'dev'
-Requires-Dist: moto; extra == 'dev'
+Requires-Dist: moto[s3]>=5.0.0; extra == 'dev'
 Requires-Dist: mypy>=0.990; extra == 'dev'
 Requires-Dist: pandas; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
 Requires-Dist: pylint>=2.14.0; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
 Requires-Dist: pytest-dependency; extra == 'dev'
-Requires-Dist: pytest-lazy-fixture; extra == 'dev'
 Requires-Dist: pytest-mock; extra == 'dev'
 Requires-Dist: pytest>=4.0.0; extra == 'dev'
 Requires-Dist: ray[default]; extra == 'dev'
@@ -94,7 +93,7 @@ Requires-Dist: docutils; extra == 'docs'
 Requires-Dist: ipython; extra == 'docs'
 Requires-Dist: matplotlib; extra == 'docs'
 Requires-Dist: nbsphinx; extra == 'docs'
-Requires-Dist: sphinx-mdinclude; extra == 'docs'
+Requires-Dist: sphinx-mdinclude==0.5.4; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme==1.3.0; extra == 'docs'
 Requires-Dist: sphinx==7.1.2; extra == 'docs'
 Description-Content-Type: text/markdown

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/pyproject.toml

@@ -63,7 +63,7 @@ docs = [
     "matplotlib",
     "nbsphinx",
     "sphinx==7.1.2",
-    "sphinx_mdinclude",
+    "sphinx_mdinclude==0.5.4",  # version fixed because 0.6.0 didnt work at release time of 3.10.2
     "sphinx_rtd_theme==1.3.0",
 ]
 dev = [
@@ -73,14 +73,13 @@ dev = [
     "click>=8.0.0",
     "fs",
     "mypy>=0.990",
-    "moto",
+    "moto[s3]>=5.0.0",
     "pandas",
     "pre-commit",
     "pylint>=2.14.0",
     "pytest>=4.0.0",
     "pytest-cov",
     "pytest-dependency",
-    "pytest-lazy-fixture",
     "pytest-mock",
     "ray[default]",
     "requests-mock",
@@ -111,7 +110,7 @@ preview = true
 [tool.ruff]
 line-length = 120
 target-version = "py38"
-select = [
+lint.select = [
     "F",    # pyflakes
     "E",    # pycodestyle
     "W",    # pycodestyle
@@ -144,7 +143,7 @@ select = [
     "RUF",  # ruff rules
 ]
 fix = true
-fixable = [
+lint.fixable = [
     "I",     # sort imports
     "F401",  # remove redundant imports
     "UP007", # use new-style union type annotations
@@ -152,7 +151,7 @@ fixable = [
     "UP037", # remove quotes around types when not necessary
     "FA100", # import future annotations where necessary (not autofixable ATM)
 ]
-ignore = [
+lint.ignore = [
     "C408",   # complains about `dict()` calls, we use them to avoid too many " in the code
     "SIM108", # tries to aggresively inline `if`, not always readable
     "COM812", # trailing comma missing, fights with black
@@ -163,11 +162,11 @@ ignore = [
     "B028",  # always demands a stacklevel argument when warning
     "PT011", # complains for `pytest.raises(ValueError)` but we use it a lot
 ]
-per-file-ignores = { "__init__.py" = ["F401"], "conf.py" = ["FA100"] }
+lint.per-file-ignores = { "__init__.py" = ["F401"], "conf.py" = ["FA100"] }
 exclude = [".git", "__pycache__", "build", "dist", "sentinelhub/aws/*"]
 
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 section-order = [
     "future",
     "standard-library",

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/_version.py

@@ -1,3 +1,3 @@
 """Version of the sentinelhub package."""
 
-__version__ = "3.10.1"
+__version__ = "3.10.3"

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/api/base_request.py

@@ -134,11 +134,13 @@ class SentinelHubBaseApiRequest(DataRequest, metaclass=ABCMeta):
         settings from config object. In case different collections have different restrictions then
         `SHConfig.sh_base_url` breaks the tie in case it matches one of the data collection URLs.
         """
-        data_collection_urls = tuple({
-            input_data_dict.service_url.rstrip("/")
-            for input_data_dict in self.payload["input"]["data"]
-            if isinstance(input_data_dict, InputDataDict) and input_data_dict.service_url is not None
-        })
+        data_collection_urls = tuple(
+            {
+                input_data_dict.service_url.rstrip("/")
+                for input_data_dict in self.payload["input"]["data"]
+                if isinstance(input_data_dict, InputDataDict) and input_data_dict.service_url is not None
+            }
+        )
         config_base_url = self.config.sh_base_url.rstrip("/")
 
         if not data_collection_urls:

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/api/batch/process.py

@@ -150,17 +150,19 @@ class SentinelHubBatch(BaseBatchClient):
         :param kwargs: Any other arguments to be added to a dictionary of parameters
         :return: A dictionary of output parameters
         """
-        return remove_undefined({
-            "defaultTilePath": default_tile_path,
-            "overwrite": overwrite,
-            "skipExisting": skip_existing,
-            "cogOutput": cog_output,
-            "cogParameters": cog_parameters,
-            "createCollection": create_collection,
-            "collectionId": collection_id,
-            "responses": responses,
-            **kwargs,
-        })
+        return remove_undefined(
+            {
+                "defaultTilePath": default_tile_path,
+                "overwrite": overwrite,
+                "skipExisting": skip_existing,
+                "cogOutput": cog_output,
+                "cogParameters": cog_parameters,
+                "createCollection": create_collection,
+                "collectionId": collection_id,
+                "responses": responses,
+                **kwargs,
+            }
+        )
 
     def iter_tiling_grids(self, **kwargs: Any) -> SentinelHubFeatureIterator:
         """An iterator over tiling grids

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/api/batch/utils.py

@@ -73,9 +73,12 @@ def monitor_batch_job(
 
     progress_bar = tqdm(total=batch_request.tile_count, initial=finished_count, desc="Progress rate")
     success_bar = tqdm(total=finished_count, initial=success_count, desc="Success rate")
+
+    monitoring_status = [BatchRequestStatus.ANALYSIS_DONE, BatchRequestStatus.PROCESSING]
     with progress_bar, success_bar:
-        while finished_count < batch_request.tile_count:
+        while finished_count < batch_request.tile_count and batch_request.status in monitoring_status:
             time.sleep(sleep_time)
+            batch_request = batch_client.get_request(batch_request)
 
             tiles_per_status = _get_batch_tiles_per_status(batch_request, batch_client)
             new_success_count = len(tiles_per_status[BatchTileStatus.PROCESSED])
@@ -93,6 +96,13 @@ def monitor_batch_job(
     failed_tiles_num = finished_count - success_count
     if failed_tiles_num:
         LOGGER.info("Batch job failed for %d tiles", failed_tiles_num)
+
+    while batch_request.status is BatchRequestStatus.PROCESSING:
+        LOGGER.info("Waiting on batch job status update.")
+        time.sleep(sleep_time)
+        batch_request = batch_client.get_request(batch_request)
+
+    LOGGER.info("Batch job finished with status %s", batch_request.status.value)
     return tiles_per_status
 
 

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/api/byoc.py

@@ -220,11 +220,13 @@ class SentinelHubBYOC(SentinelHubService):
         headers = {"Content-Type": MimeType.JSON.get_string()}
 
         _tile = self._to_dict(tile)
-        updates = remove_undefined({
-            "path": _tile["path"],
-            "coverGeometry": _tile.get("coverGeometry"),
-            "sensingTime": _tile.get("sensingTime"),
-        })
+        updates = remove_undefined(
+            {
+                "path": _tile["path"],
+                "coverGeometry": _tile.get("coverGeometry"),
+                "sensingTime": _tile.get("sensingTime"),
+            }
+        )
 
         return self.client.get_json(
             url=url, request_type=RequestType.PUT, post_values=updates, headers=headers, use_session=True

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/api/catalog.py

@@ -140,20 +140,22 @@ class SentinelHubCatalog(SentinelHubService):
         if geometry and geometry.crs is not CRS.WGS84:
             geometry = geometry.transform(CRS.WGS84)
 
-        payload = remove_undefined({
-            "collections": [collection_id],
-            "datetime": f"{start_time}/{end_time}" if time else None,
-            "bbox": list(bbox) if bbox else None,
-            "intersects": geometry.get_geojson(with_crs=False) if geometry else None,
-            "ids": ids,
-            "filter": self._prepare_filters(filter, collection, filter_lang),
-            "filter-lang": filter_lang,
-            "filter-crs": filter_crs,
-            "fields": fields,
-            "distinct": distinct,
-            "limit": limit,
-            **kwargs,
-        })
+        payload = remove_undefined(
+            {
+                "collections": [collection_id],
+                "datetime": f"{start_time}/{end_time}" if time else None,
+                "bbox": list(bbox) if bbox else None,
+                "intersects": geometry.get_geojson(with_crs=False) if geometry else None,
+                "ids": ids,
+                "filter": self._prepare_filters(filter, collection, filter_lang),
+                "filter-lang": filter_lang,
+                "filter-crs": filter_crs,
+                "fields": fields,
+                "distinct": distinct,
+                "limit": limit,
+                **kwargs,
+            }
+        )
 
         return CatalogSearchIterator(self.client, url, payload)
 

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/config.py

@@ -24,7 +24,7 @@ SH_CLIENT_SECRET_ENV_VAR = "SH_CLIENT_SECRET"
 
 
 @dataclass(repr=False)
-class _SHConfig:
+class _SHConfig:  # pylint: disable=too-many-instance-attributes
     instance_id: str = ""
     sh_client_id: str = ""
     sh_client_secret: str = ""
@@ -46,6 +46,7 @@ class _SHConfig:
     download_sleep_time: float = 5.0
     download_timeout_seconds: float = 120.0
     number_of_download_processes: int = 1
+    max_retries: int | None = None
 
     def __post_init__(self) -> None:
         if self.sh_auth_base_url is not None:
@@ -94,6 +95,7 @@ class SHConfig(_SHConfig):
           attempt this number exponentially increases with factor `3`.
         - `download_timeout_seconds`: Maximum number of seconds before download attempt is canceled.
         - `number_of_download_processes`: Number of download processes, used to calculate rate-limit sleep time.
+        - `max_retries`: Maximum number of retries until an exception is raised.
 
     The location of `config.toml` for manual modification can be found with `SHConfig.get_config_location()`.
     """

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/constants.py

@@ -81,7 +81,7 @@ class CRSMeta(EnumMeta):
 
         return super().__new__(mcs, cls, bases, classdict)
 
-    def __call__(cls, crs_value, *args, **kwargs):  # type: ignore[no-untyped-def] # noqa: N805
+    def __call__(cls, crs_value, *args, **kwargs):  # type: ignore[no-untyped-def]
         """This is executed whenever CRS('something') is called"""
         # pylint: disable=signature-differs
         crs_value = cls._parse_crs(crs_value)
@@ -201,7 +201,7 @@ class CRS(Enum, metaclass=CRSMeta):
         """
         return self.name.startswith("UTM")
 
-    @functools.lru_cache(maxsize=128)  # noqa: B019
+    @functools.lru_cache(maxsize=128)
     def projection(self) -> pyproj.Proj:
         """Returns a projection in form of pyproj class.
 
@@ -212,7 +212,7 @@ class CRS(Enum, metaclass=CRSMeta):
         """
         return pyproj.Proj(self._get_pyproj_projection_def(), preserve_units=True)
 
-    @functools.lru_cache(maxsize=128)  # noqa: B019
+    @functools.lru_cache(maxsize=128)
     def pyproj_crs(self) -> pyproj.CRS:
         """Returns a pyproj CRS class.
 
@@ -223,7 +223,7 @@ class CRS(Enum, metaclass=CRSMeta):
         """
         return pyproj.CRS(self._get_pyproj_projection_def())
 
-    @functools.lru_cache(maxsize=512)  # noqa: B019
+    @functools.lru_cache(maxsize=512)
     def get_transform_function(self, other: CRS, always_xy: bool = True) -> Callable[..., tuple]:
         """Returns a function for transforming geometrical objects from one CRS to another. The function will support
         transformations between any objects that pyproj supports.

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/data_collections_bands.py

@@ -1,4 +1,4 @@
-""" Contains information about data collections used by SH """
+"""Contains information about data collections used by SH"""
 
 from __future__ import annotations
 

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/download/handlers.py

@@ -52,7 +52,7 @@ def fail_user_errors(download_func: Callable[[Self, DownloadRequest], T]) -> Cal
 
 
 def retry_temporary_errors(
-    download_func: Callable[[SelfWithConfig, DownloadRequest], T]
+    download_func: Callable[[SelfWithConfig, DownloadRequest], T],
 ) -> Callable[[SelfWithConfig, DownloadRequest], T]:
     """Decorator function for handling server and connection errors"""
     backoff_coefficient = 3

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/download/sentinelhub_client.py

@@ -15,7 +15,7 @@ from requests import Response
 
 from ..config import SHConfig
 from ..constants import SHConstants
-from ..exceptions import SHRateLimitWarning, SHRuntimeWarning
+from ..exceptions import OutOfRequestsException, SHRateLimitWarning, SHRuntimeWarning
 from ..types import JsonDict
 from .client import DownloadClient
 from .handlers import fail_user_errors, retry_temporary_errors
@@ -75,10 +75,12 @@ class SentinelHubDownloadClient(DownloadClient):
         """
         Executes the download with a single thread and uses a rate limit object, which is shared between all threads
         """
+        download_attempts = 0
         while True:
             sleep_time = self._execute_thread_safe(self.rate_limit.register_next)
 
             if sleep_time == 0:
+                download_attempts += 1
                 LOGGER.debug(
                     "Sending %s request to %s. Hash of sent request is %s",
                     request.request_type.value,
@@ -89,6 +91,9 @@ class SentinelHubDownloadClient(DownloadClient):
 
                 if response.status_code == requests.status_codes.codes.TOO_MANY_REQUESTS:
                     warnings.warn("Download rate limit hit", category=SHRateLimitWarning)
+                    if self.config.max_retries is not None and download_attempts >= self.config.max_retries:
+                        raise OutOfRequestsException("Maximum number of download attempts reached")
+
                     self._execute_thread_safe(self.rate_limit.update, response.headers, default=self.default_retry_time)
                     continue
 

{sentinelhub-3.10.1 → sentinelhub-3.10.3}/sentinelhub/geometry.py

@@ -150,7 +150,7 @@ class BBox(_BaseGeometry):
 
     @staticmethod
     def _tuple_from_list_or_tuple(
-        bbox: tuple[float, float, float, float] | tuple[tuple[float, float], tuple[float, float]]
+        bbox: tuple[float, float, float, float] | tuple[tuple[float, float], tuple[float, float]],
     ) -> tuple[float, float, float, float]:
         """Converts a list or tuple representation of a bbox into a flat tuple representation.