sentinelhub 3.10.1__py3-none-any.whl → 3.10.2__py3-none-any.whl

sentinelhub/_version.py

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

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/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/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/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/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/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/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/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/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.
 

{sentinelhub-3.10.1.dist-info → sentinelhub-3.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: sentinelhub
-Version: 3.10.1
+Version: 3.10.2
 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.dist-info → sentinelhub-3.10.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
 sentinelhub/.utmzones.geojson,sha256=2kBUChuQK-ffIAc-5c8zluUa1JGgkop1HTShmhwp80s,768447
 sentinelhub/__init__.py,sha256=sXLQjfrL_0hFpZkl4cIavVLpMgXYP6SGixBXLSVqh6c,2185
-sentinelhub/_version.py,sha256=TS1qSVtKnb0j1UJPbWjP3YLKj6HriHiHCPbXlqhXvzc,66
+sentinelhub/_version.py,sha256=jGtSnzPFNOsNMe0Rk7gYsIWc4mOpshHocEnUsFfiQcM,66
 sentinelhub/areas.py,sha256=Wuu6WwOlGQkvK9P4C7FGxC42IEyfYqifobdMd0ty4Fw,31885
 sentinelhub/base.py,sha256=g3E2Nh6I0c3GrkTmJ2rVK_disN2spQUn-yCWc_4NqMk,12857
 sentinelhub/commands.py,sha256=KHDT0uJATP9vWxjNLpUpaboPfHoXC3nIlmFGqS8DL0E,3306
-sentinelhub/config.py,sha256=fxKgSbiei62ePXvIUg2sBYDPXKR_UA93tkS_pdvnrFg,10201
+sentinelhub/config.py,sha256=8ZJ8f4LKRwO6dDLHBtP_-T8yf8zUbQ_K5GafRhDaAXc,10365
 sentinelhub/constants.py,sha256=t8ivRGwBtXdCbqF1A7Zh_q5Zw599g1BdjVvb_n-ubAA,13528
 sentinelhub/data_collections.py,sha256=MxlNztn487sb-yBwbi1-uiLGis__-lCDvPSew8td6js,24305
-sentinelhub/data_collections_bands.py,sha256=Q_rFCqkrW11oAQrxPL4IdeximMqiUPkTGv9ZqP15d-g,11310
+sentinelhub/data_collections_bands.py,sha256=H-oQUyHjcROHfe063Rt0C9I-2csmPlAlmNmVyJfZ9iE,11308
 sentinelhub/data_utils.py,sha256=8RPF1mg79ZgavtrPVPbvBBCaIphqEWYezTezyRJZcEY,7572
 sentinelhub/decoding.py,sha256=qKG75pFFFRlafX_8-SvCs9nlKrvzx9KB1sHGE5eTFVQ,6692
 sentinelhub/evalscript.py,sha256=1e78isrLBncvRM1ZB2ZdqWCq7jw4GP4A9wBwDlRA9kw,4564
 sentinelhub/exceptions.py,sha256=OZJRA0-nWby7wfihxTLVV27_w06QywjXHOZ1xZAhbq4,3864
 sentinelhub/geo_utils.py,sha256=1z8M-GwPygzqH15qpnYOkVg-qFnz9dT8TUbKsBOI4HA,8485
-sentinelhub/geometry.py,sha256=jeHOYzdcTqP37gKMDu2-2TatrbjqTs_wTB4LASdoPtE,23000
+sentinelhub/geometry.py,sha256=lklhZd0EyKDOm3u17BVwz-v0bwW_FxarHzxudWar7Ck,23001
 sentinelhub/io_utils.py,sha256=6J5cSkDItR6bShoI2ztAfW0GERSHrv6mXQrLo451IR8,5360
 sentinelhub/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sentinelhub/testing_utils.py,sha256=e6ZeYvHF6rHaMrXOXuwVY30_QDFWd2YqWG3PD1RWscc,2346
@@ -21,9 +21,9 @@ sentinelhub/time_utils.py,sha256=AcI8iRWMe6Qn073H8sKQnxSeGqZjuZ7dlZvuFwM7AtU,802
 sentinelhub/types.py,sha256=m5bZPsdXNf10uh43QBzE3ajcE6P26QfQcXCY11ky_uw,393
 sentinelhub/api/__init__.py,sha256=WKpWQK4F9o9pvLxtFme7OJ0Lo6fgoiPw-UQ1EE5UXNU,813
 sentinelhub/api/base.py,sha256=EVgbL7trpTLj99Ei8nMSjmWq5MYJG1PPGyzQpK03JpY,4254
-sentinelhub/api/base_request.py,sha256=3sGBr8z52SOePAr3-vzSNkLMH3HE-Z46_F5pbKH8jbc,9526
-sentinelhub/api/byoc.py,sha256=0fGlxUns0sPgjJoLYn39_DDUfLzQoVLmP9aCDaHb0qk,12179
-sentinelhub/api/catalog.py,sha256=xuWZFm_354yAkQYHr0sj9rHf8uPBaWwRws8vU9Kl7xU,13966
+sentinelhub/api/base_request.py,sha256=jpczEjLbs4X__-5_-WFwFsgvlktdNDRlfmcCKJWJhhQ,9564
+sentinelhub/api/byoc.py,sha256=CXB8jamhGfRiuhO0JyZDnKrqPetXa9LdHtLcXQ6Bqcs,12217
+sentinelhub/api/catalog.py,sha256=WuInAWYf36wn9aHbV2OKuyOL07u75DA93MpWj7ugwnY,14040
 sentinelhub/api/fis.py,sha256=pLGm9q351RuVUwGpQrhx778co7CMONd0FN81OVEC448,6451
 sentinelhub/api/ogc.py,sha256=cYYBCQRkVh0IEsuzX5sIxzNZ09O86k8p5yxF4nTkC7U,30244
 sentinelhub/api/opensearch.py,sha256=nNaykGfpfX1OurS1gFj4NLxUzCwi-r6oPR0WOVNUOwg,7706
@@ -33,7 +33,7 @@ sentinelhub/api/utils.py,sha256=kjhHT_czAKFY14kPBxqkjUaJ9P-6RMKRceNC5_SrGm4,3730
 sentinelhub/api/wfs.py,sha256=QFg1pTrTwYWhuAwvhFVAcjTTW5Kn_mEONpTBfL04asw,7604
 sentinelhub/api/batch/__init__.py,sha256=q2uKqxC7_aBoVf_mmKhzVUrdA5kPDVO_TnChdEa5eZo,454
 sentinelhub/api/batch/base.py,sha256=uALuJnGKyp2Zx0-T9ku_1pxS3E9wOcXrwyHgPXXxdyk,4348
-sentinelhub/api/batch/process.py,sha256=6ryuQE1z4K64tZd7NuFnVB9gDXxJpgmXUVz8NJtdUt4,24249
+sentinelhub/api/batch/process.py,sha256=bNvRfS5sQ2Bf9H0T3DPjAKVlK8QqTRv_haoAvMnl6xI,24311
 sentinelhub/api/batch/statistical.py,sha256=7RqmKqfS56IlCEMnRWo_aG8gsivjN39J5lLx8BxrFtE,8156
 sentinelhub/api/batch/utils.py,sha256=_c6vjatxeS0Krhm2Rs5jclBZwqV3P-VoZmkjGlExP40,10767
 sentinelhub/aws/__init__.py,sha256=AreOfOvDp6Sy6jfMGMCI44fDBMqgtWk-lUFXQ-8ehK8,503
@@ -46,17 +46,17 @@ sentinelhub/aws/data_safe.py,sha256=U_vSySCG4KZYPjINVTsSoQD5GQejCpN2tqBaUbWkRqA,
 sentinelhub/aws/request.py,sha256=DO-xf05kqDcJvmw18iKYmjtKaandBiXoAsdgKZDCcIA,10989
 sentinelhub/download/__init__.py,sha256=KdyMDc79cVUwy2wCLK3URPFY2uRVs41-MuS4qlkMQrE,352
 sentinelhub/download/client.py,sha256=qwxoGjL8idUSPb55zRNRfJRxuBhhDf-bqZmLRBt0_kA,11587
-sentinelhub/download/handlers.py,sha256=-NBAuPZndafs0sOXK4hCOmGIpdlQrL8Ug1hvJu2P1KA,5499
+sentinelhub/download/handlers.py,sha256=J1XcUHe5UbZYRGxC-aeQV9FCEBbr__vp3NxFpde2ekM,5500
 sentinelhub/download/models.py,sha256=sMyVrilTHQMAMRQ4TJK-fr3ltU9sCOWX4JtTdPvEfXg,10054
 sentinelhub/download/rate_limit.py,sha256=jN9EifCwF0ojL-NvYIyD34fFeK4U-DQTsYkntpxnCv8,5248
-sentinelhub/download/sentinelhub_client.py,sha256=1NVq1tOv5t4Jtb6LxHVDiGo2SBh2O0iUl9I0RUoeCh8,9131
+sentinelhub/download/sentinelhub_client.py,sha256=62g3JxbDzHfFqXBXtoZYyO9ESXA1UvM2mO1qRvqd0t4,9434
 sentinelhub/download/sentinelhub_statistical_client.py,sha256=mzU3TCY2zqp6UlW_4466833WXSiWkDYNZkjv95cPnwU,4474
 sentinelhub/download/session.py,sha256=KMRUw6wVEb68g8FZknIMk3BkAQvmghiCpIQ1rhhIJ48,14615
 sentinelhub/geopedia/__init__.py,sha256=R1wvAx_41U_KkDQif3Dubngyv2nR1zOIedxCdvhP3MM,263
 sentinelhub/geopedia/core.py,sha256=gU7CWZe8q5ZlZX4j1Zub4kvg5Nd7YZvtLCHGcuQAkfY,16370
 sentinelhub/geopedia/request.py,sha256=nmrEHJzqG13npSF8co23d8gZGXqxT5pyAu2geZ_fnmY,6618
-sentinelhub-3.10.1.dist-info/METADATA,sha256=2OJWCkCBTU_p495MV03vQkU7ediCLXytqWM_mhMBU8k,10207
-sentinelhub-3.10.1.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-sentinelhub-3.10.1.dist-info/entry_points.txt,sha256=nQiaLJk-L-7XCwyDiMozwfnJ7WI2Rc9FqnJDBt6K51g,212
-sentinelhub-3.10.1.dist-info/licenses/LICENSE.md,sha256=Gczr65g8pY0N0OO_5g-zI3RTidQTMBVlL0JxM7n8tGM,1071
-sentinelhub-3.10.1.dist-info/RECORD,,
+sentinelhub-3.10.2.dist-info/METADATA,sha256=mLXlyJSS0H2lDdr64BTwM7cjJiIj27QT9TgBj37pkhY,10174
+sentinelhub-3.10.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+sentinelhub-3.10.2.dist-info/entry_points.txt,sha256=nQiaLJk-L-7XCwyDiMozwfnJ7WI2Rc9FqnJDBt6K51g,212
+sentinelhub-3.10.2.dist-info/licenses/LICENSE.md,sha256=Gczr65g8pY0N0OO_5g-zI3RTidQTMBVlL0JxM7n8tGM,1071
+sentinelhub-3.10.2.dist-info/RECORD,,

{sentinelhub-3.10.1.dist-info → sentinelhub-3.10.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.0
+Generator: hatchling 1.24.2
 Root-Is-Purelib: true
 Tag: py3-none-any