eodash_catalog 0.0.34__tar.gz → 0.0.35__tar.gz

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

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.34
+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.34 → eodash_catalog-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.34
+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

{eodash_catalog-0.0.34 → 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.34"
+__version__ = "0.0.35"

{eodash_catalog-0.0.34 → 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