eodag 4.0.0a2__py3-none-any.whl → 4.0.0a3__py3-none-any.whl

eodag/api/collection.py

@@ -132,6 +132,7 @@ class Collection(BaseModel):
     def set_id_from_alias(self) -> Self:
         """if an alias exists, use it to update id attribute"""
         if self.alias is not None:
+            self._id = self.id
             self.id = self.alias
         return self
 
@@ -290,7 +291,7 @@ class CollectionsDict(UserDict[str, Collection]):
     ) -> None:
         super().__init__()
 
-        self.data = {col.id: col for col in collections}
+        self.data = {col._id: col for col in collections}
 
     def __str__(self) -> str:
         return "{" + ", ".join(f'"{col}": {col_f}' for col, col_f in self.items()) + "}"

eodag/api/core.py

@@ -567,8 +567,6 @@ class EODataAccessGateway:
             # First, update collections list if possible
             self.fetch_collections_list(provider=provider)
 
-        collections: CollectionsList = CollectionsList([])
-
         providers_configs = (
             list(self.providers_config.values())
             if not provider
@@ -584,15 +582,17 @@ class EODataAccessGateway:
                 f"The requested provider is not (yet) supported: {provider}"
             )
 
-        for p in providers_configs:
-            for collection_id in p.products:
-                if collection_id == GENERIC_COLLECTION:
-                    continue
+        # unique collection ids from providers configs
+        collection_ids = {
+            collection_id
+            for p in providers_configs
+            for collection_id in p.products
+            if collection_id != GENERIC_COLLECTION
+        }
 
-                if (
-                    collection := self.collections_config[collection_id]
-                ) not in collections:
-                    collections.append(collection)
+        collections = CollectionsList(
+            [self.collections_config[collection_id] for collection_id in collection_ids]
+        )
 
         # Return the collections sorted in lexicographic order of their id
         collections.sort(key=attrgetter("id"))
@@ -881,15 +881,14 @@ class EODataAccessGateway:
                             try:
                                 # new_collection_conf does not already exist, append it
                                 # to self.collections_config
-                                self.collections_config[
-                                    new_collection
-                                ] = Collection.create_with_dag(
+                                new_coll_obj = Collection.create_with_dag(
                                     self,
                                     id=new_collection,
                                     **new_collections_conf["collections_config"][
                                         new_collection
                                     ],
                                 )
+                                self.collections_config[new_coll_obj._id] = new_coll_obj
                             except ValidationError:
                                 # skip collection if there is a problem with its id (missing or not a string)
                                 logger.debug(
@@ -910,7 +909,7 @@ class EODataAccessGateway:
                                 # increase the increment if the new collection had
                                 # bad formatted attributes in the external config
                                 dumped_collection = self.collections_config[
-                                    new_collection
+                                    new_coll_obj._id
                                 ].model_dump()
                                 dumped_ext_conf_col = {
                                     **dumped_collection,
@@ -988,7 +987,7 @@ class EODataAccessGateway:
         :returns: Internal name of the collection.
         """
         collections = [
-            k for k, v in self.collections_config.items() if v.alias == alias_or_id
+            v for k, v in self.collections_config.items() if v.id == alias_or_id
         ]
 
         if len(collections) > 1:
@@ -1004,7 +1003,7 @@ class EODataAccessGateway:
                     f"Could not find collection from alias or id {alias_or_id}"
                 )
 
-        return collections[0]
+        return collections[0]._id or collections[0].id
 
     def get_alias_from_collection(self, collection: str) -> str:
         """Return the alias of a collection by its id. If no alias was defined for the
@@ -1059,13 +1058,16 @@ class EODataAccessGateway:
         :raises: :class:`~eodag.utils.exceptions.NoMatchingCollection`
         """
         if collection := kwargs.get("collection"):
-            try:
-                collection = self.get_collection_from_alias(collection)
+            if collection in self.collections_config:
                 return CollectionsList([self.collections_config[collection]])
-            except NoMatchingCollection:
-                return CollectionsList(
-                    [Collection.create_with_dag(self, id=collection)]
-                )
+            else:
+                try:
+                    collection = self.get_collection_from_alias(collection)
+                    return CollectionsList([self.collections_config[collection]])
+                except NoMatchingCollection:
+                    return CollectionsList(
+                        [Collection.create_with_dag(self, id=collection)]
+                    )
 
         filters: dict[str, str] = {
             k: v
@@ -1100,7 +1102,6 @@ class EODataAccessGateway:
                 or col not in self._plugins_manager.collection_to_provider_config_map
             ):
                 continue
-
             score = 0  # how many filters matched
 
             # free text search
@@ -1147,16 +1148,24 @@ class EODataAccessGateway:
                 min_aware = datetime.datetime.min.replace(tzinfo=datetime.timezone.utc)
                 max_aware = datetime.datetime.max.replace(tzinfo=datetime.timezone.utc)
 
-                col_start = col_f.extent.temporal.interval[0][0]
-                col_end = col_f.extent.temporal.interval[0][1]
+                col_start_str = col_f.extent.temporal.interval[0][0]
+                if col_start_str and isinstance(col_start_str, str):
+                    col_start = rfc3339_str_to_datetime(col_start_str)
+                else:
+                    col_start = col_start_str or min_aware
+                col_end_str = col_f.extent.temporal.interval[0][1]
+                if col_end_str and isinstance(col_end_str, str):
+                    col_end = rfc3339_str_to_datetime(col_end_str)
+                else:
+                    col_end = col_end_str or max_aware
 
                 max_start = max(
                     rfc3339_str_to_datetime(start_date) if start_date else min_aware,
-                    col_start or min_aware,
+                    col_start,
                 )
                 min_end = min(
                     rfc3339_str_to_datetime(end_date) if end_date else max_aware,
-                    col_end or max_aware,
+                    col_end,
                 )
                 if not (max_start <= min_end):
                     continue

eodag/resources/providers.yml

@@ -6046,8 +6046,8 @@
       next_page_url_key_path: null
       next_page_query_obj_key_path: null
       next_page_token_key: page
-      # 1000 is ok and 2000 fails
-      max_items_per_page: 1000
+      # As of 2025/11/21 the geodes API documentation (https://geodes.cnes.fr/support/api/) states that pagination must be limited to 80.
+      max_items_per_page: 80
     sort:
       sort_by_tpl: '{{"sortBy": [ {{"field": "{sort_param}", "direction": "{sort_order}" }} ] }}'
       sort_by_default:
@@ -6176,8 +6176,8 @@
       next_page_url_key_path: null
       next_page_query_obj_key_path: null
       next_page_token_key: page
-      # 1000 is ok and 2000 fails
-      max_items_per_page: 1000
+      # As of 2025/11/21 the geodes API documentation (https://geodes.cnes.fr/support/api/) states that pagination must be limited to 80.
+      max_items_per_page: 80
     sort:
       sort_by_tpl: '{{"sortBy": [ {{"field": "{sort_param}", "direction": "{sort_order}" }} ] }}'
       sort_by_default:

{eodag-4.0.0a2.dist-info → eodag-4.0.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodag
-Version: 4.0.0a2
+Version: 4.0.0a3
 Summary: Earth Observation Data Access Gateway
 Home-page: https://github.com/CS-SI/eodag
 Author: CS GROUP - France

{eodag-4.0.0a2.dist-info → eodag-4.0.0a3.dist-info}/RECORD

@@ -4,8 +4,8 @@ eodag/config.py,sha256=uErvz-nQHPRAzUnlxSgq5SxHCxWfDSML3xhm_BDBR1s,49862
 eodag/crunch.py,sha256=fLVAPGVPw31N_DrnFk4gkCpQZLMY8oBhK6NUSYmdr24,1099
 eodag/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eodag/api/__init__.py,sha256=ytr30NUVmEtmJTsp3QCwkCIhS1nF6UlFCv0vmySHN7g,735
-eodag/api/collection.py,sha256=qiVtXO6eqAJTmJFiKKXbHFXbQRlttojW_3kKegOjZYo,13720
-eodag/api/core.py,sha256=82c7CHEhHdnkHDlzIxHigaYGereQ8aECkTnsBv5dWUk,107085
+eodag/api/collection.py,sha256=m-lrzQCCKRF8fEp6k2hzIr1ap-8UP11jmkGTmJ6dBtw,13752
+eodag/api/core.py,sha256=fKjID4B1btXHHlZqxqyuqYlmehBieWRZtKFiJ96nveo,107671
 eodag/api/search_result.py,sha256=LGWIQgbhQF5Lz489vcvalb2VsYtplyzUXGWMqduP0uc,21107
 eodag/api/product/__init__.py,sha256=6-RXKAw-sZVNU-7KjpmSqLc35dfc0V42wI5GqIzH2QA,2501
 eodag/api/product/_assets.py,sha256=9bWIe_SYvsQO-q_lQFd7SxhUIWv7feze2-wnXOe8hhs,7570
@@ -58,7 +58,7 @@ eodag/resources/collections.yml,sha256=0JZr5y8V8QlB1MGqGzs5-Pmrk1ZYkEBlS3VYrg22N
 eodag/resources/ext_collections.json,sha256=8BSdJ_G0F9LG9h_Z_EOTmSmhceDl3-uFVaW7iVoh4qo,2438459
 eodag/resources/ext_product_types.json,sha256=DaM0YN_V5gdMDyb1zHnF37YC8eOQhG4i-byB9d2gcT8,2456884
 eodag/resources/locations_conf_template.yml,sha256=_eBv-QKHYMIKhY0b0kp4Ee33RsayxN8LWH3kDXxfFSk,986
-eodag/resources/providers.yml,sha256=1EK66cdWNG0T6d8YfPfs1nl4fQ4oDvX10vn5h_WsxWE,237678
+eodag/resources/providers.yml,sha256=2ryHvNIaBpETbAJUQzXAbY08crWxzbBUfTJ1yprVZr0,237882
 eodag/resources/stac_provider.yml,sha256=RNhFNhv7593VkY2od-LQgUBdIO1WXL1Rko7UyjLaxFY,4648
 eodag/resources/user_conf_template.yml,sha256=aHSiscSQ3B4Dd18709iQAX7tFrkMufRC1a9akcNVVTs,7541
 eodag/resources/shp/ne_110m_admin_0_map_units.VERSION.txt,sha256=CHSo_jbv-4d4D0MYRbWn2FvmV_K9mYzo7qznF4YNO3g,7
@@ -85,9 +85,9 @@ eodag/utils/repr.py,sha256=72BIKFq07aU4YrQVJJX-AADdWXAhJqC4LXGmkbCo1kA,5537
 eodag/utils/requests.py,sha256=avNHKrOZ7Kp6lUA7u4kqupIth9MoirLzDsMrrmQDt4s,4560
 eodag/utils/s3.py,sha256=eESanPLVv-Luqo_o1WgUuO7YLqiXg_iEzHZ15fu-ugY,30063
 eodag/utils/stac_reader.py,sha256=8r6amio5EtwGF9iu9zHaGDz4oUPKKeXRuyTzPNakrO4,9406
-eodag-4.0.0a2.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
-eodag-4.0.0a2.dist-info/METADATA,sha256=GDIvwACmfGQA6E-XFIfoCkkr4tblKoFg2m4jgdIEuek,12739
-eodag-4.0.0a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eodag-4.0.0a2.dist-info/entry_points.txt,sha256=atMIh-Q4hRsOdw1_778mDIhWFHQJigEo3x-0fMqhqLE,2254
-eodag-4.0.0a2.dist-info/top_level.txt,sha256=025IMTmVe5eDjIPP4KEFQKespOPMQdne4U4jOy8nftM,6
-eodag-4.0.0a2.dist-info/RECORD,,
+eodag-4.0.0a3.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
+eodag-4.0.0a3.dist-info/METADATA,sha256=fiwL-AiTQrS3gNc3WEwe_BFmec9qV1ZS75QK1a4gLCA,12739
+eodag-4.0.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eodag-4.0.0a3.dist-info/entry_points.txt,sha256=atMIh-Q4hRsOdw1_778mDIhWFHQJigEo3x-0fMqhqLE,2254
+eodag-4.0.0a3.dist-info/top_level.txt,sha256=025IMTmVe5eDjIPP4KEFQKespOPMQdne4U4jOy8nftM,6
+eodag-4.0.0a3.dist-info/RECORD,,