eodash_catalog 0.0.34__py3-none-any.whl → 0.0.35__py3-none-any.whl

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/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

{eodash_catalog-0.0.34.dist-info → eodash_catalog-0.0.35.dist-info}/METADATA

@@ -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.dist-info → eodash_catalog-0.0.35.dist-info}/RECORD

@@ -1,14 +1,14 @@
-eodash_catalog/__about__.py,sha256=E85nFpHWi4zVhfnqROklSKnFZhc9qXPdY62-2YS2AXY,138
+eodash_catalog/__about__.py,sha256=XROj_01m1eUHyHi51MiSGj8n1eY3AhxttN52YSE0S0I,138
 eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
 eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
 eodash_catalog/endpoints.py,sha256=9cSdB_IczNW9hzOJRrI5_qmgsn4snWvUszN6qtvxZn8,37749
 eodash_catalog/generate_indicators.py,sha256=0IHhu_0yOUoUtLqiTsoYQ2IrTrq00yZme3UE6pC9PIU,19772
-eodash_catalog/sh_endpoint.py,sha256=F99LpYT-MGhPiwdSSysm3xBTjaQBXRUkieh-q-vhTvE,1012
+eodash_catalog/sh_endpoint.py,sha256=h4OryUjvO1zEJB3ObnHUmAnXc4YCOxbxNhmDn9UVIk8,1220
 eodash_catalog/stac_handling.py,sha256=2iJwBbsBZIBqGWOdnpIfSug0SoOjbkutpSbWAeQRECU,17828
 eodash_catalog/thumbnails.py,sha256=qZDcpQe80ki6lEMKYdZtSnnHH0PUpcoXTvU9bYdPlzU,2260
 eodash_catalog/utils.py,sha256=YBB-cfS_Z4ErMAuBVizBQg18IMIxJb4amW1MfDGExg0,11666
-eodash_catalog-0.0.34.dist-info/METADATA,sha256=LNzkOJ7Q_si5WMYkWZY0CwDK50Rc5uxqVgp3QpBx3UQ,3196
-eodash_catalog-0.0.34.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.34.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.34.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.34.dist-info/RECORD,,
+eodash_catalog-0.0.35.dist-info/METADATA,sha256=YFoc5dq5lxNNAo4hMB5nOSt6AkVqXHLNCEuQOBonJPI,3196
+eodash_catalog-0.0.35.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.35.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.35.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.35.dist-info/RECORD,,