cdsetool 0.2.9__tar.gz → 0.2.10__tar.gz

{cdsetool-0.2.9/src/cdsetool.egg-info → cdsetool-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.9
+Version: 0.2.10
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -12,12 +12,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer<0.13,>=0.9
 Requires-Dist: rich<13.8,>=13.6
-Requires-Dist: requests<2.32.0,>=2.28.1
+Requires-Dist: requests<2.33.0,>=2.28.1
 Requires-Dist: pyjwt[crypto]~=2.8.0
 Requires-Dist: geopandas>=0.13.2
 Provides-Extra: test
 Requires-Dist: black==24.4.2; extra == "test"
-Requires-Dist: pylint==3.1.0; extra == "test"
+Requires-Dist: pylint==3.2.2; extra == "test"
 Requires-Dist: pytest==8.2.0; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: requests-mock==1.12.1; extra == "test"
@@ -96,7 +96,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.9
+pip install cdsetool==0.2.10
 ```
 
 ## Usage

{cdsetool-0.2.9 → cdsetool-0.2.10}/README.md

@@ -71,7 +71,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.9
+pip install cdsetool==0.2.10
 ```
 
 ## Usage

{cdsetool-0.2.9 → cdsetool-0.2.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdsetool"
-version = "0.2.9"
+version = "0.2.10"
 authors = [
   { name="Jacob Vejby", email="javej@sdfi.dk" },
 ]
@@ -18,14 +18,14 @@ classifiers = [
 dependencies = [
   "typer >= 0.9,< 0.13",
   "rich >= 13.6,< 13.8",
-  "requests >= 2.28.1,< 2.32.0",
+  "requests >= 2.28.1,< 2.33.0",
   "pyjwt[crypto] ~= 2.8.0",
   "geopandas >= 0.13.2",
 ]
 [project.optional-dependencies]
 test = [
     "black==24.4.2",
-    "pylint==3.1.0",
+    "pylint==3.2.2",
     "pytest==8.2.0",
     "pytest-cov==5.0.0",
     "requests-mock==1.12.1",

{cdsetool-0.2.9 → cdsetool-0.2.10}/src/cdsetool/credentials.py

@@ -70,6 +70,13 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
 
     RETRY_CODES = frozenset([413, 429, 500, 502, 503])
 
+    RETRIES = Retry(
+        total=5,
+        backoff_factor=0.5,
+        raise_on_status=False,
+        status_forcelist=RETRY_CODES,
+    )
+
     def __init__(
         self,
         username=None,
@@ -81,12 +88,6 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         self.__password = password
 
         self.__proxies = proxies
-        self.__retries = Retry(
-            total=5,
-            backoff_factor=0.5,
-            raise_on_status=False,
-            status_forcelist=self.RETRY_CODES,
-        )
         self.__openid_conf = None
         self.__jwks = None
         self.__openid_configuration_endpoint = (
@@ -111,11 +112,16 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         """
         Returns a session with the credentials set as the Authorization header
         """
-        return self.__make_session(True, self.__retries, self.__proxies)
+        return self.make_session(self, True, self.RETRIES, self.__proxies)
 
-    def __make_session(self, authorization, max_retries, proxies):
+    @staticmethod
+    def make_session(caller, authorization, max_retries, proxies):
+        """
+        Creates a new session. Authorization is only available from callers
+        that are subclasses of Credentials.
+        """
         if authorization:
-            self.__ensure_tokens()
+            caller.__ensure_tokens()  # pylint: disable=protected-access
 
         session = requests.Session()
         session.mount("http://", HTTPAdapter(max_retries=max_retries))
@@ -123,13 +129,15 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         if proxies is not None:
             session.proxies.update(proxies)
         if authorization:
-            session.headers.update({"Authorization": f"Bearer {self.__access_token}"})
+            token = caller.__access_token  # pylint: disable=protected-access
+            session.headers.update({"Authorization": f"Bearer {token}"})
         return session
 
     def __token_exchange(self, data):
         # Make a session that will retry post, respecting the retry-after
         # header when we get a 503 and a few other temporary failures.
-        session = self.__make_session(
+        session = self.make_session(
+            caller=self,
             authorization=False,
             max_retries=Retry(
                 total=2,
@@ -140,7 +148,6 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
             ),
             proxies=self.__proxies,
         )
-        now = datetime.now()
         response = session.post(self.__token_endpoint, data=data, timeout=120)
 
         if response.status_code == 401:
@@ -157,13 +164,11 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
 
         self.__access_token = response["access_token"]
         self.__refresh_token = response["refresh_token"]
-        self.__access_token_expires = now + timedelta(seconds=response["expires_in"])
-        self.__refresh_token_expires = now + timedelta(
-            seconds=response["refresh_expires_in"]
-        )
+        return timedelta(seconds=response["refresh_expires_in"])
 
     def __ensure_tokens(self):
         with self.__lock:
+            refresh_expire_delta = None
             if self.__access_token_expires < datetime.now():
                 if self.__refresh_token_expires < datetime.now():
                     data = {
@@ -178,13 +183,13 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
                         "refresh_token": self.__refresh_token,
                         "client_id": "cdse-public",
                     }
-                self.__token_exchange(data)
+                refresh_expire_delta = self.__token_exchange(data)
             try:
                 key = self.__jwk_client.get_signing_key_from_jwt(self.__access_token)
             except jwt.PyJWKClientConnectionError as e:
                 raise TokenClientConnectionError from e
             try:
-                jwt.decode(
+                data = jwt.decode(
                     self.__access_token,
                     key=key.key,
                     algorithms=self.__id_token_signing_algos,  # pylint: disable=protected-access
@@ -192,6 +197,11 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
                 )
             except jwt.ExpiredSignatureError as e:
                 raise TokenExpiredSignatureError from e
+            if refresh_expire_delta is not None:
+                self.__access_token_expires = datetime.fromtimestamp(data["exp"])
+                self.__refresh_token_expires = (
+                    datetime.fromtimestamp(data["iat"]) + refresh_expire_delta
+                )
 
     def __read_credentials(self):
         try:
@@ -206,8 +216,11 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         if self.__openid_conf:
             return self.__openid_conf
 
-        session = self.__make_session(
-            authorization=False, max_retries=self.__retries, proxies=self.__proxies
+        session = self.make_session(
+            caller=self,
+            authorization=False,
+            max_retries=self.RETRIES,
+            proxies=self.__proxies,
         )
         response = session.get(self.__openid_configuration_endpoint, timeout=120)
         response.raise_for_status()

{cdsetool-0.2.9 → cdsetool-0.2.10}/src/cdsetool/query.py

@@ -8,8 +8,8 @@ from xml.etree import ElementTree
 from datetime import datetime, date
 import re
 import json
-import requests
 import geopandas as gpd
+from cdsetool.credentials import Credentials
 
 
 class _FeatureIterator:
@@ -67,7 +67,10 @@ class FeatureQuery:
     def __fetch_features(self):
         if self.next_url is None:
             return
-        with requests.get(self.next_url, timeout=120, proxies=self.proxies) as response:
+        session = Credentials.make_session(
+            None, False, Credentials.RETRIES, self.proxies
+        )
+        with session.get(self.next_url) as response:
             response.raise_for_status()
             res = response.json()
             self.features += res.get("features") or []
@@ -236,18 +239,17 @@ _describe_docs = {}
 def _get_describe_doc(collection, proxies=None):
     if _describe_docs.get(collection):
         return _describe_docs.get(collection)
-    res = requests.get(
+    session = Credentials.make_session(None, False, Credentials.RETRIES, proxies)
+    with session.get(
         "https://catalogue.dataspace.copernicus.eu"
         + f"/resto/api/collections/{collection}/describe.xml",
-        timeout=120,
-        proxies=proxies,
-    )
-    assert res.status_code == 200, (
-        f"Unable to find collection with name {collection}. Please see "
-        + "https://documentation.dataspace.copernicus.eu"
-        + "/APIs/OpenSearch.html#collections "
-        + "for a list of available collections"
-    )
+    ) as res:
+        assert res.status_code == 200, (
+            f"Unable to find collection with name {collection}. Please see "
+            + "https://documentation.dataspace.copernicus.eu"
+            + "/APIs/OpenSearch.html#collections "
+            + "for a list of available collections"
+        )
 
-    _describe_docs[collection] = res.content
+        _describe_docs[collection] = res.content
     return _describe_docs.get(collection)

{cdsetool-0.2.9 → cdsetool-0.2.10/src/cdsetool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.9
+Version: 0.2.10
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -12,12 +12,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer<0.13,>=0.9
 Requires-Dist: rich<13.8,>=13.6
-Requires-Dist: requests<2.32.0,>=2.28.1
+Requires-Dist: requests<2.33.0,>=2.28.1
 Requires-Dist: pyjwt[crypto]~=2.8.0
 Requires-Dist: geopandas>=0.13.2
 Provides-Extra: test
 Requires-Dist: black==24.4.2; extra == "test"
-Requires-Dist: pylint==3.1.0; extra == "test"
+Requires-Dist: pylint==3.2.2; extra == "test"
 Requires-Dist: pytest==8.2.0; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: requests-mock==1.12.1; extra == "test"
@@ -96,7 +96,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.9
+pip install cdsetool==0.2.10
 ```
 
 ## Usage

{cdsetool-0.2.9 → cdsetool-0.2.10}/src/cdsetool.egg-info/requires.txt

@@ -1,12 +1,12 @@
 typer<0.13,>=0.9
 rich<13.8,>=13.6
-requests<2.32.0,>=2.28.1
+requests<2.33.0,>=2.28.1
 pyjwt[crypto]~=2.8.0
 geopandas>=0.13.2
 
 [test]
 black==24.4.2
-pylint==3.1.0
+pylint==3.2.2
 pytest==8.2.0
 pytest-cov==5.0.0
 requests-mock==1.12.1