eodash_catalog 0.0.33__tar.gz → 0.0.35__tar.gz

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.33
+current_version = 0.0.35
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.33
+Version: 0.0.35
 Summary: This package is intended to help create a compatible STAC catalog for the eodash dashboard client. It supports configuration of multiple endpoint types for information extraction.
 Project-URL: Documentation, https://github.com/eodash/eodash_catalog#readme
 Project-URL: Issues, https://github.com/eodash/eodash_catalog/issues
@@ -23,8 +23,8 @@ Requires-Dist: mergedeep
 Requires-Dist: oauthlib<3.3
 Requires-Dist: owslib
 Requires-Dist: pygeofilter[backend-native]==0.2.0
-Requires-Dist: pystac-client<0.6
-Requires-Dist: pystac[validation]<=1.8.3
+Requires-Dist: pystac-client<1
+Requires-Dist: pystac[validation]<2
 Requires-Dist: python-dateutil<3
 Requires-Dist: python-dotenv<1.1.0
 Requires-Dist: pyyaml<7

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "oauthlib<3.3",
   "requests-oauthlib<1.3.2",
   "python-dotenv<1.1.0",
-  "pystac-client<0.6",
+  "pystac-client<1",
   "pyyaml<7",
   "redis<4",
   "pygeofilter[backend-native]==0.2.0",
@@ -39,7 +39,7 @@ dependencies = [
   "structlog<22.0",
   "OWSLib",
   "spdx-lookup<=0.3.3",
-  "pystac[validation]<=1.8.3",
+  "pystac[validation]<2",
 ]
 [project.scripts]
 eodash_catalog = "eodash_catalog.generate_indicators:process_catalogs"

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/requirements.txt

@@ -3,7 +3,7 @@ setuptools<71
 oauthlib<3.3
 requests-oauthlib<1.3.2
 python-dotenv<1.1.0
-pystac-client<0.6
+pystac-client==0.8.3
 pyyaml<7
 redis<4
 pygeofilter[backend-native]==0.2.0
@@ -14,9 +14,9 @@ python-dateutil<3
 swiftspec==0.0.2
 mergedeep
 structlog<22.0
-OWSLib<1.0
+OWSLib==0.31
 spdx-lookup<=0.3.3
-pystac[validation]<=1.8.3
+pystac[validation]==1.10.1
 
 # dev tooling
 pytest==8.1.1

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/src/eodash_catalog/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Daniel Santillan <daniel.santillan@eox.at>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.33"
+__version__ = "0.0.35"

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/src/eodash_catalog/endpoints.py

@@ -212,7 +212,9 @@ def process_STACAPI_Endpoint(
     )
     # We keep track of potential duplicate times in this list
     added_times = {}
+    any_item_added = False
     for item in results.items():
+        any_item_added = True
         item_datetime = item.get_datetime()
         if item_datetime is not None:
             iso_date = item_datetime.isoformat()[:10]
@@ -272,7 +274,7 @@ def process_STACAPI_Endpoint(
             endpoint_config,
             item,
         )
-    if added_times:
+    if any_item_added:
         collection.update_extent_from_items()
     else:
         LOGGER.warn(

{eodash_catalog-0.0.33 → eodash_catalog-0.0.35}/src/eodash_catalog/sh_endpoint.py

@@ -1,10 +1,11 @@
 import os
+import time
 
 from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session
 
 SH_TOKEN_URL = "https://services.sentinel-hub.com/oauth/token"
-_token_cache: dict[str, str] = {}
+_token_cache: dict[str, dict] = {}
 
 
 def get_SH_token(endpoint_config: dict) -> str:
@@ -14,8 +15,10 @@ def get_SH_token(endpoint_config: dict) -> str:
     if env_id := endpoint_config.get("CustomSHEnvId"):
         client_id = os.getenv(f"SH_CLIENT_ID_{env_id}", "")
         client_secret = os.getenv(f"SH_CLIENT_SECRET_{env_id}", "")
-    if client_id in _token_cache:
-        return _token_cache[client_id]
+
+    if client_id in _token_cache and _token_cache[client_id]["expires_at"] > time.time():
+        print("returning from cache")
+        return _token_cache[client_id]["access_token"]
     # Create a session
     client = BackendApplicationClient(client_id=client_id)
     oauth = OAuth2Session(client=client)
@@ -25,6 +28,6 @@ def get_SH_token(endpoint_config: dict) -> str:
         client_secret=client_secret,
     )
     access_token = token["access_token"]
-    _token_cache[client_id] = access_token
-
+    _token_cache[client_id] = {"access_token": access_token, "expires_at": token["expires_at"]}
+    print("returning directly")
     return access_token