sentinelhub 3.11.2__tar.gz → 3.11.4__tar.gz

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentinelhub
-Version: 3.11.2
+Version: 3.11.4
 Summary: Python API for Sentinel Hub
 Project-URL: Homepage, https://github.com/sentinel-hub/sentinelhub-py
 Project-URL: Documentation, https://sentinelhub-py.readthedocs.io

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/__init__.py

@@ -14,7 +14,6 @@ from .api import (
     ByocCollectionAdditionalData,
     ByocCollectionBand,
     ByocTile,
-    FisRequest,
     SentinelHubBatchStatistical,
     SentinelHubBYOC,
     SentinelHubCatalog,
@@ -30,7 +29,6 @@ from .api import (
     monitor_batch_statistical_job,
     opensearch,
 )
-from .api.fis import HistogramType
 from .api.ogc import CustomUrlParam
 from .api.opensearch import get_area_dates, get_area_info, get_tile_info, get_tile_info_id
 from .areas import (

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/_version.py

@@ -1,3 +1,3 @@
 """Version of the sentinelhub package."""
 
-__version__ = "3.11.2"
+__version__ = "3.11.4"

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/api/__init__.py

@@ -16,7 +16,6 @@ from .batch import (
 )
 from .byoc import ByocCollection, ByocCollectionAdditionalData, ByocCollectionBand, ByocTile, SentinelHubBYOC
 from .catalog import SentinelHubCatalog
-from .fis import FisRequest
 from .ogc import WcsRequest, WmsRequest
 from .process import AsyncProcessRequest, SentinelHubRequest, get_async_running_status
 from .statistical import SentinelHubStatistical

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/api/batch/process.py

@@ -87,7 +87,7 @@ class BatchProcessClient(BaseBatchClient):
                 "processRequest": request_dict,
                 "input": input,
                 "output": output,
-                "instance_type": instance_type,
+                "instanceType": instance_type,
                 "description": description,
                 **kwargs,
             }

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/api/ogc.py

@@ -19,7 +19,7 @@ from ..data_collections import DataCollection
 from ..download import DownloadRequest, SentinelHubDownloadClient
 from ..geo_utils import get_image_dimension
 from ..geometry import BBox, Geometry
-from ..time_utils import RawTimeIntervalType, RawTimeType, filter_times, parse_time_interval, serialize_time
+from ..time_utils import RawTimeIntervalType, RawTimeType, filter_times, serialize_time
 from .wfs import WebFeatureService
 
 LOGGER = logging.getLogger(__name__)
@@ -147,9 +147,6 @@ class OgcRequest(DataRequest):
             if param not in CustomUrlParam:
                 raise ValueError(f"Parameter {param} is not a valid custom url parameter. Please check and fix.")
 
-        if self.service_type is ServiceType.FIS and CustomUrlParam.GEOMETRY in self.custom_url_params:
-            raise ValueError(f"{CustomUrlParam.GEOMETRY} should not be a custom url parameter of a FIS request")
-
     def create_request(self, reset_wfs_iterator: bool = False) -> None:
         """Set download requests
 
@@ -346,7 +343,6 @@ class OgcImageService:
         date: datetime.datetime | None = None,
         size_x: None | str | int = None,
         size_y: None | str | int = None,
-        geometry: None | BBox | Geometry = None,
     ) -> str:
         """Returns url to Sentinel Hub's OGC service for the product specified by the OgcRequest and date.
 
@@ -366,8 +362,6 @@ class OgcImageService:
             params = {**params, **self._get_wms_url_parameters(request, size_x, size_y)}  # type: ignore[arg-type]
         elif request.service_type is ServiceType.WCS:
             params = {**params, **self._get_wcs_url_parameters(request, size_x, size_y)}  # type: ignore[arg-type]
-        elif request.service_type is ServiceType.FIS:
-            params = {**params, **self._get_fis_parameters(request, geometry)}  # type: ignore[arg-type]
 
         return f"{url}/{authority}?{urlencode(params)}"
 
@@ -386,7 +380,7 @@ class OgcImageService:
 
     @staticmethod
     def _get_common_url_parameters(request: OgcRequest) -> dict[str, Any]:
-        """Returns parameters common dictionary for WMS, WCS and FIS request.
+        """Returns parameters common dictionary for WMS, and WCS request.
 
         :param request: OGC-type request with specified bounding box, cloud coverage for specific product.
         :return: dictionary with parameters
@@ -477,43 +471,6 @@ class OgcImageService:
         """
         return {"RESX": size_x, "RESY": size_y, "COVERAGE": request.layer, "REQUEST": "GetCoverage", "VERSION": "1.1.2"}
 
-    @staticmethod
-    def _get_fis_parameters(request: OgcRequest, geometry: BBox | Geometry) -> dict[str, Any]:
-        """Returns parameters dictionary for FIS request.
-
-        :param request: OGC-type request with specified bounding box, cloud coverage for specific product.
-        :param geometry: list of bounding boxes or geometries
-        :return: dictionary with parameters
-        """
-        start_time, end_time = serialize_time(parse_time_interval(request.time), use_tz=True)
-
-        params = {
-            "CRS": CRS.ogc_string(geometry.crs),
-            "LAYER": request.layer,
-            "RESOLUTION": request.resolution,  # type: ignore[attr-defined]
-            "TIME": f"{start_time}/{end_time}",
-        }
-
-        if not isinstance(geometry, (BBox, Geometry)):
-            raise ValueError(
-                f"Each geometry must be an instance of sentinelhub.{BBox.__name__} or "
-                f"sentinelhub.{Geometry.__name__} but {geometry} found"
-            )
-        if geometry.crs is CRS.WGS84:
-            geometry = geometry.reverse()
-        if isinstance(geometry, Geometry):
-            params["GEOMETRY"] = geometry.wkt
-        else:
-            params["BBOX"] = str(geometry)
-
-        if request.bins:  # type: ignore[attr-defined]
-            params["BINS"] = request.bins  # type: ignore[attr-defined]
-
-        if request.histogram_type:  # type: ignore[attr-defined]
-            params["TYPE"] = request.histogram_type.value  # type: ignore[attr-defined]
-
-        return params
-
     def get_dates(self, request: OgcRequest) -> list[datetime.datetime | None]:
         """Get available Sentinel-2 acquisitions at least time_difference apart
 

{sentinelhub-3.11.2 → sentinelhub-3.11.4}/sentinelhub/constants.py

@@ -41,7 +41,6 @@ class ServiceType(Enum):
     WFS = "wfs"
     AWS = "aws"
     IMAGE = "image"
-    FIS = "fis"
     PROCESSING_API = "processing"
 
 

sentinelhub-3.11.2/sentinelhub/api/fis.py

@@ -1,143 +0,0 @@
-"""
-Module for working with Sentinel Hub FIS service
-"""
-
-from __future__ import annotations
-
-import datetime
-import warnings
-from enum import Enum
-from typing import Any
-
-from ..constants import MimeType, RequestType, ServiceType
-from ..download import DownloadRequest
-from ..exceptions import SHDeprecationWarning
-from ..geometry import BBox, Geometry
-from ..time_utils import RawTimeIntervalType, RawTimeType
-from .ogc import OgcImageService, OgcRequest
-from .wfs import WebFeatureService
-
-
-class HistogramType(Enum):
-    """Enum class for types of histogram supported by Sentinel Hub FIS service
-
-    Supported histogram types are EQUALFREQUENCY, EQUIDISTANT and STREAMING
-    """
-
-    EQUALFREQUENCY = "equalfrequency"
-    EQUIDISTANT = "equidistant"
-    STREAMING = "streaming"
-
-
-class FisRequest(OgcRequest):
-    """``Deprecated - use Statistical API instead!``
-
-    The class for interacting with Feature Info Service.
-
-    For more info check `FIS documentation <https://www.sentinel-hub.com/develop/api/ogc/fis-request/>`__.
-    """
-
-    DEPRECATION_MESSAGE = (
-        "Fis service is being deprecated in favour of SentinelHubStatistical. Although no immediate action is needed as"
-        " FIS is still supported, consider switching to Statistical API because it provides additional functionalities."
-    )
-
-    def __init__(
-        self,
-        layer: str,
-        time: RawTimeType | RawTimeIntervalType,
-        geometry_list: list[Geometry | BBox],
-        *,
-        resolution: str = "10m",
-        bins: str | None = None,
-        histogram_type: HistogramType | None = None,
-        **kwargs: Any,
-    ):
-        """
-        :param layer: An ID of a layer configured in Sentinel Hub Dashboard. It has to be configured for the same
-            instance ID which will be used for this request. The satellite collection of the layer in Dashboard
-            must also match the one given by `data_collection` parameter.
-        :param time: time or time range for which to return the results, in ISO8601 format
-            (year-month-date, for example: ``2016-01-01``, or year-month-dateThours:minutes:seconds format,
-            i.e. ``2016-01-01T16:31:21``). Examples: ``'2016-01-01'``, or ``('2016-01-01', ' 2016-01-31')``
-            (datetime.datetime, datetime.datetime)
-        :param geometry_list: A WKT representation of a geometry describing the region of interest.
-            Note that WCS 1.1.1 standard is used here, so for EPSG:4326 coordinates should be in latitude/longitude
-            order.
-        :param resolution: Specifies the spatial resolution, in meters per pixel, of the image from which the statistics
-            are to be estimated. When using CRS=EPSG:4326 one has to add the "m" suffix to
-            enforce resolution in meters per pixel (e.g. RESOLUTION=10m).
-        :param bins: The number of bins (a positive integer) in the histogram. If this parameter is absent no histogram
-            is computed.
-        :param histogram_type: type of histogram
-        :param data_collection: A collection of requested satellite data. It has to be the same as defined in Sentinel
-            Hub Dashboard for the given layer. Default is Sentinel-2 L1C.
-        :param maxcc: maximum accepted cloud coverage of an image. Float between 0.0 and 1.0. Default is ``1.0``.
-        :param custom_url_params: Dictionary of CustomUrlParameters and their values supported by Sentinel Hub's WMS
-            and WCS services. All available parameters are described in
-            `documentation <https://www.sentinel-hub.com/develop/api/ogc/custom-parameters/>`__. Note: in
-            case of constants.CustomUrlParam.EVALSCRIPT the dictionary value must be a string
-            of Javascript code that is not encoded into base64.
-        :param data_folder: location of the directory where the fetched data will be saved.
-        :param config: A custom instance of config class to override parameters from the saved configuration.
-        """
-        self.geometry_list = geometry_list
-        self.resolution = resolution
-        self.bins = bins
-        self.histogram_type = HistogramType(histogram_type) if histogram_type else None
-
-        super().__init__(
-            bbox=None, layer=layer, time=time, service_type=ServiceType.FIS, **kwargs  # type: ignore[arg-type]
-        )
-
-    def create_request(self) -> None:  # type: ignore[override]
-        """Set download requests
-
-        Create a list of DownloadRequests for all Sentinel-2 acquisitions within request's time interval and
-        acceptable cloud coverage.
-        """
-
-        warnings.warn(self.DEPRECATION_MESSAGE, category=SHDeprecationWarning, stacklevel=2)
-        fis_service = _FisService(config=self.config)
-        self.download_list = fis_service.get_request(self)
-
-    def get_dates(self) -> list[datetime.datetime | None]:
-        """This method is not supported for FIS request"""
-        raise NotImplementedError
-
-    def get_tiles(self) -> WebFeatureService | None:
-        """This method is not supported for FIS request"""
-        raise NotImplementedError
-
-
-class _FisService(OgcImageService):
-    """Sentinel Hub OGC services class for providing FIS data
-
-    Intermediate layer between FIS requests and the Sentinel Hub FIS services.
-    """
-
-    def get_request(self, request: FisRequest) -> list[DownloadRequest]:  # type: ignore[override]
-        """Get download requests
-
-        Create a list of DownloadRequests for all Sentinel-2 acquisitions within request's time interval and
-        acceptable cloud coverage.
-
-        :param request: OGC-type request with specified bounding box, time interval, and cloud coverage for specific
-            product.
-        """
-
-        return [self._create_request(request=request, geometry=geometry) for geometry in request.geometry_list]
-
-    def _create_request(self, request: FisRequest, geometry: BBox | Geometry) -> DownloadRequest:
-        url = self.get_base_url(request)
-
-        post_data = {**self._get_common_url_parameters(request), **self._get_fis_parameters(request, geometry)}
-        post_data = {k.lower(): v for k, v in post_data.items()}  # lowercase required on SH service
-
-        return DownloadRequest(
-            url=f"{url}/{self.config.instance_id}",
-            post_values=post_data,
-            data_type=MimeType.JSON,
-            headers={"Content-Type": MimeType.JSON.get_string()},
-            request_type=RequestType.POST,
-        )