Issue #134/#100 Drop 0.4.0-style ImageCollectionClient

Open-EO · Mar 7, 2023 · 97da6d2 · 97da6d2
1 parent d16417c
commit 97da6d2
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 1,559 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Remove `ImageCollectionClient` (and related helpers),
+  a now unused leftover from the pre-1.0.0 versions of the openEO API
+  ([#134](https://github.com/Open-EO/openeo-python-client/issues/134), [#100](https://github.com/Open-EO/openeo-python-client/issues/100))
+
 ### Fixed
 
 

diff --git a/examples/mundialis_extended.py b/examples/mundialis_extended.py
@@ -80,8 +80,7 @@ def execute(
         image_collection,
         json.dumps(connection.describe_collection(image_collection), indent=2),
     )
-    # TODO: change to con.load_collection()
-    cube = ImageCollectionClient.load_collection(session = connection, collection_id = image_collection, bands = all_bands)
+    cube = connection.load_collection(collection_id=image_collection, bands=all_bands)
     cube = cube.filter_bbox( **bbox)
     cube = cube.filter_temporal(extent=temporal_extent)
 

diff --git a/examples/mundialis_mini.py b/examples/mundialis_mini.py
@@ -20,11 +20,9 @@
 spectral_extent = ["S2_8", "S2_4", "S2_2"]
 
 # connect to mundialis backend
-session = openeo.connect(backend_url).authenticate_basic()
+connection = openeo.connect(backend_url).authenticate_basic()
 
-# TODO change to s2_radiometry = session.load_collection( ...)
-s2_radiometry = ImageCollectionClient.load_collection(
-                    session=session,
+s2_radiometry = connection.load_collection(
                     collection_id=collection_id,
                     temporal_extent=temporal_extent,
                     spatial_extent=spatial_extent

diff --git a/examples/py3_process_wrapper-wcps_eurac.py b/examples/py3_process_wrapper-wcps_eurac.py
@@ -78,7 +78,7 @@ def execute(
         image_collection,
         json.dumps(connection.describe_collection(image_collection), indent=2),
     )
-    cube = ImageCollectionClient.load_collection(session = connection, collection_id = image_collection, bands = all_bands)
+    cube = connection.load_collection(collection_id=image_collection, bands=all_bands)
     cube = cube.filter_bbox( **bbox)
     cube = cube.filter_temporal(extent=temporal_extent)
 

diff --git a/openeo/_version.py b/openeo/_version.py
@@ -1 +1 @@
-__version__ = "0.15.1a1"
+__version__ = "0.16.0a1"
diff --git a/openeo/internal/graphbuilder_040.py b/openeo/internal/graphbuilder_040.py
diff --git a/openeo/rest/connection.py b/openeo/rest/connection.py
@@ -31,7 +31,6 @@
     OidcClientInfo, OidcAuthenticator, OidcRefreshTokenAuthenticator, OidcResourceOwnerPasswordAuthenticator, \
     OidcDeviceAuthenticator, OidcProviderInfo, OidcException, DefaultOidcClientGrant, GrantsChecker
 from openeo.rest.datacube import DataCube
-from openeo.rest.imagecollectionclient import ImageCollectionClient
 from openeo.rest.mlmodel import MlModel
 from openeo.rest.userfile import UserFile
 from openeo.rest.job import BatchJob, RESTJob
@@ -1001,18 +1000,13 @@ def load_collection(
         .. versionadded:: 0.13.0
             added the ``max_cloud_cover`` argument.
         """
-        if self._api_version.at_least("1.0.0"):
-            return DataCube.load_collection(
+        assert self._api_version.at_least("1.0.0")
+        return DataCube.load_collection(
                 collection_id=collection_id, connection=self,
                 spatial_extent=spatial_extent, temporal_extent=temporal_extent, bands=bands, properties=properties,
                 max_cloud_cover=max_cloud_cover,
                 fetch_metadata=fetch_metadata,
             )
-        else:
-            return ImageCollectionClient.load_collection(
-                collection_id=collection_id, session=self,
-                spatial_extent=spatial_extent, temporal_extent=temporal_extent, bands=bands
-            )
 
     imagecollection = legacy_alias(load_collection, name="imagecollection")
 
@@ -1245,7 +1239,9 @@ def service(self, service_id: str) -> Service:
         """
         return Service(service_id, connection=self)
 
-    def load_disk_collection(self, format: str, glob_pattern: str, options: dict = {}) -> ImageCollectionClient:
+    def load_disk_collection(
+        self, format: str, glob_pattern: str, options: Optional[dict] = None
+    ) -> DataCube:
         """
         Loads image data from disk as an ImageCollection.
 
@@ -1254,11 +1250,10 @@ def load_disk_collection(self, format: str, glob_pattern: str, options: dict = {
         :param options: options specific to the file format
         :return: the data as an ImageCollection
         """
-
-        if self._api_version.at_least("1.0.0"):
-            return DataCube.load_disk_collection(self, format, glob_pattern, **options)
-        else:
-            return ImageCollectionClient.load_disk_collection(self, format, glob_pattern, **options)
+        assert self._api_version.at_least("1.0.0")
+        return DataCube.load_disk_collection(
+            self, format, glob_pattern, **(options or {})
+        )
 
     def as_curl(self, data: Union[dict, DataCube], path="/result", method="POST") -> str:
         """