cdsetool 0.2.9__tar.gz → 0.2.11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.9
+Version: 0.2.11
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -10,15 +10,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 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: typer<1,>=0.9
+Requires-Dist: rich<14,>=13.6
+Requires-Dist: requests<3,>=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: pytest==8.2.0; extra == "test"
+Requires-Dist: pylint==3.2.2; extra == "test"
+Requires-Dist: pytest==8.2.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: requests-mock==1.12.1; extra == "test"
 Requires-Dist: pytest-mock==3.14.0; 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.11
 ```
 
 ## Usage

{cdsetool-0.2.9 → cdsetool-0.2.11}/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.11
 ```
 
 ## Usage

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdsetool"
-version = "0.2.9"
+version = "0.2.11"
 authors = [
   { name="Jacob Vejby", email="javej@sdfi.dk" },
 ]
@@ -16,17 +16,17 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 dependencies = [
-  "typer >= 0.9,< 0.13",
-  "rich >= 13.6,< 13.8",
-  "requests >= 2.28.1,< 2.32.0",
+  "typer >= 0.9,< 1",
+  "rich >= 13.6,< 14",
+  "requests >= 2.28.1,< 3",
   "pyjwt[crypto] ~= 2.8.0",
   "geopandas >= 0.13.2",
 ]
 [project.optional-dependencies]
 test = [
     "black==24.4.2",
-    "pylint==3.1.0",
-    "pytest==8.2.0",
+    "pylint==3.2.2",
+    "pytest==8.2.1",
     "pytest-cov==5.0.0",
     "requests-mock==1.12.1",
     "pytest-mock==3.14.0",
@@ -46,6 +46,17 @@ max-locals = 20
 max-line-length = "88"
 disable="fixme"
 
+[tool.pyright]
+exclude = ["**/__pycache__", ".venv"]
+
+# Can be strict too, see more fine-grained settings at:
+# https://github.com/microsoft/pyright/blob/main/docs/configuration.md#diagnostic-settings-defaults
+typeCheckingMode = "standard"
+
+executionEnvironments = [
+  { root = "./" }
+]
+
 [tool.pytest.ini_options]
 addopts = [
     "--import-mode=importlib",

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool/_processing.py

@@ -2,11 +2,18 @@
 This module provides functions for processing data concurrently
 """
 
-from concurrent.futures import wait, FIRST_COMPLETED
+from concurrent.futures import Future, wait, FIRST_COMPLETED
 from concurrent.futures import ThreadPoolExecutor
+from typing import Callable, Generator, Iterable, List, Union
 
+from cdsetool.query import FeatureQuery
 
-def _concurrent_process(fun, iterable, workers=4):
+
+def _concurrent_process(
+    fun: Callable[[FeatureQuery], Union[str, None]],
+    iterable: Iterable,
+    workers: int = 4,
+) -> Generator[Union[str, None], None, None]:
     """
     Process items in an iterable concurrently
 
@@ -26,17 +33,17 @@ def _concurrent_process(fun, iterable, workers=4):
     iterator = iter(iterable)
 
     with ThreadPoolExecutor(max_workers=workers) as executor:
-        futures = []
+        futures: List[Future[Union[str, None]]] = []  # pylint: disable=E1136
 
         # Pluck an item from the iterable and submit it to the executor.
         # If the iterable is exhausted, this function is a no-op.
-        def submit_item():
+        def submit_item() -> None:
             item = next(iterator, None)
             if item is not None:
                 futures.append(executor.submit(fun, item))
 
         # Fill the futures list up to the low water mark
-        def fill_futures():
+        def fill_futures() -> None:
             for _ in range(low_water_mark - len(futures)):
                 submit_item()
 
@@ -47,8 +54,8 @@ def _concurrent_process(fun, iterable, workers=4):
         while futures:
 
             # Wait for the first future(s) to complete
-            done, futures = wait(futures, return_when=FIRST_COMPLETED)
-            futures = list(futures)
+            done, not_done = wait(futures, return_when=FIRST_COMPLETED)
+            futures = list(not_done)
 
             for future in done:
                 yield future.result()

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool/cli.py

@@ -5,7 +5,7 @@ Command line interface
 import os
 import sys
 import json as JSON
-from typing import List, Optional
+from typing import Dict, List, Optional
 from typing_extensions import Annotated
 import typer
 from cdsetool.query import describe_collection, query_features
@@ -19,7 +19,7 @@ app.add_typer(query_app, name="query")
 
 
 @query_app.command("search-terms")
-def query_search_terms(collection: str):
+def query_search_terms(collection: str) -> None:
     """
     List the available search terms for a collection
     """
@@ -51,13 +51,12 @@ def query_search(
         ),
     ] = None,
     json: Annotated[bool, typer.Option(help="Output JSON")] = False,
-):
+) -> None:
     """
     Search for features matching the search terms
     """
     search_term = search_term or []
-    search_term = _to_dict(search_term)
-    features = query_features(collection, search_term)
+    features = query_features(collection, _to_dict(search_term))
 
     for feature in features:
         if json:
@@ -84,7 +83,7 @@ def download(
             + "Pass multiple times for multiple search terms"
         ),
     ] = None,
-):
+) -> None:
     """
     Download all features matching the search terms
     """
@@ -93,8 +92,7 @@ def download(
         sys.exit(1)
 
     search_term = search_term or []
-    search_term = _to_dict(search_term)
-    features = query_features(collection, search_term)
+    features = query_features(collection, _to_dict(search_term))
 
     list(
         download_features(
@@ -116,7 +114,7 @@ def main():
     app()
 
 
-def _to_dict(term_list: List[str]):
+def _to_dict(term_list: List[str]) -> Dict[str, str]:
     search_terms = {}
     for item in term_list:
         key, value = item.split("=")

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

@@ -6,6 +6,8 @@ the Copernicus Identity and Access Management (IAM) system.
 from datetime import datetime, timedelta
 import netrc
 import threading
+from typing import Any, Dict, List, Union
+
 import requests
 import jwt
 from requests.adapters import HTTPAdapter
@@ -70,35 +72,36 @@ 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,
-        password=None,
-        openid_configuration_endpoint=None,
-        proxies=None,
-    ):
-        self.__username = username
-        self.__password = password
-
-        self.__proxies = proxies
-        self.__retries = Retry(
-            total=5,
-            backoff_factor=0.5,
-            raise_on_status=False,
-            status_forcelist=self.RETRY_CODES,
-        )
+        username: Union[str, None] = None,
+        password: Union[str, None] = None,
+        openid_configuration_endpoint: Union[str, None] = None,
+        proxies: Union[Dict[str, str], None] = None,
+    ) -> None:
+        self.__username: Union[str, None] = username
+        self.__password: Union[str, None] = password
+
+        self.__proxies: Union[Dict[str, str], None] = proxies
         self.__openid_conf = None
         self.__jwks = None
-        self.__openid_configuration_endpoint = (
+        self.__openid_configuration_endpoint: str = (
             openid_configuration_endpoint
             or "https://identity.dataspace.copernicus.eu"
             + "/auth/realms/CDSE/.well-known/openid-configuration"
         )
 
-        self.__access_token = None
-        self.__refresh_token = None
-        self.__access_token_expires = datetime.now() - timedelta(hours=8)
-        self.__refresh_token_expires = self.__access_token_expires
+        self.__access_token: Union[str, None] = None
+        self.__refresh_token: Union[str, None] = None
+        self.__access_token_expires: datetime = datetime.now() - timedelta(hours=8)
+        self.__refresh_token_expires: datetime = self.__access_token_expires
 
         self.__lock = threading.Lock()
 
@@ -107,15 +110,25 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
 
         self.__ensure_tokens()
 
-    def get_session(self):
+    def get_session(self) -> requests.Session:
         """
         Returns a session with the credentials set as the Authorization header
         """
-        return self.__make_session(True, self.__retries, self.__proxies)
-
-    def __make_session(self, authorization, max_retries, proxies):
+        return self.make_session(self, True, self.RETRIES, self.__proxies)
+
+    @staticmethod
+    def make_session(
+        caller,
+        authorization: bool,
+        max_retries: Retry,
+        proxies: Union[Dict[str, str], None],
+    ) -> requests.Session:
+        """
+        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 +136,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):
+    def __token_exchange(self, data: Dict[str, str]) -> timedelta:
         # 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,14 +155,13 @@ 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:
             raise InvalidCredentialsException(
                 "Unable to exchange token with "
                 + f"username: {self.__username} and "
-                + f"password: {len(self.__password) * '*'}"
+                + f"password: {len(self.__password or '') * '*'}"
             )
 
         if response.status_code != 200:
@@ -157,13 +171,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):
+    def __ensure_tokens(self) -> None:
         with self.__lock:
+            refresh_expire_delta = None
             if self.__access_token_expires < datetime.now():
                 if self.__refresh_token_expires < datetime.now():
                     data = {
@@ -178,13 +190,17 @@ 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)
+            if not self.__access_token:
+                raise InvalidCredentialsException(
+                    "Internal error: access token not available"
+                )
             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,22 +208,29 @@ 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:
-            self.__username, _, self.__password = netrc.netrc().authenticators(
-                self.__token_endpoint
-            )
-        except Exception as exc:
-            raise NoCredentialsException("No credentials found") from exc
+    def __read_credentials(self) -> None:
+        rv = netrc.netrc().authenticators(self.__token_endpoint)
+        if isinstance(rv, tuple):
+            self.__username, _, self.__password = rv
+        else:
+            raise NoCredentialsException("No credentials found")
 
     @property
-    def __openid_configuration(self):
+    def __openid_configuration(self) -> Dict[str, Any]:
         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()
@@ -215,19 +238,19 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         return self.__openid_conf
 
     @property
-    def __token_endpoint(self):
+    def __token_endpoint(self) -> str:
         return self.__openid_configuration["token_endpoint"]
 
     @property
-    def __jwks_uri(self):
+    def __jwks_uri(self) -> str:
         return self.__openid_configuration["jwks_uri"]
 
     @property
-    def __id_token_signing_algos(self):
+    def __id_token_signing_algos(self) -> List[str]:
         return self.__openid_configuration["id_token_signing_alg_values_supported"]
 
     @property
-    def __jwk_client(self):
+    def __jwk_client(self) -> jwt.PyJWKClient:
         if self.__jwks:
             return self.__jwks
 
@@ -236,7 +259,9 @@ class Credentials:  # pylint: disable=too-few-public-methods disable=too-many-in
         return self.__jwks
 
 
-def validate_credentials(username=None, password=None):
+def validate_credentials(
+    username: Union[str, None] = None, password: Union[str, None] = None
+) -> bool:
     """
     This function validates CDSE credentials and returns a bool.
     If credentials are none, .netrc will be validated

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool/download.py

@@ -10,6 +10,9 @@ import random
 import tempfile
 import time
 import shutil
+from typing import Any, Dict, Generator, Union
+
+from requests import Session
 from requests.exceptions import ChunkedEncodingError
 from urllib3.exceptions import ProtocolError
 from cdsetool._processing import _concurrent_process
@@ -19,10 +22,13 @@ from cdsetool.credentials import (
     TokenExpiredSignatureError,
 )
 from cdsetool.logger import NoopLogger
-from cdsetool.monitor import NoopMonitor
+from cdsetool.monitor import NoopMonitor, StatusMonitor
+from cdsetool.query import FeatureQuery
 
 
-def download_feature(feature, path, options=None):
+def download_feature(
+    feature, path: str, options: Union[Dict[str, Any], None] = None
+) -> Union[str, None]:
     """
     Download a single feature
 
@@ -86,7 +92,9 @@ def download_feature(feature, path, options=None):
     return None
 
 
-def download_features(features, path, options=None):
+def download_features(
+    features: FeatureQuery, path: str, options: Union[Dict[str, Any], None] = None
+) -> Generator[Union[str, None], None, None]:
     """
     Generator function that downloads all features in a result set
 
@@ -100,7 +108,7 @@ def download_features(features, path, options=None):
     options["monitor"] = _get_monitor(options)
     options["monitor"].start()
 
-    def _download_feature(feature):
+    def _download_feature(feature) -> Union[str, None]:
         return download_feature(feature, path, options)
 
     yield from _concurrent_process(
@@ -110,11 +118,11 @@ def download_features(features, path, options=None):
     options["monitor"].stop()
 
 
-def _get_feature_url(feature):
+def _get_feature_url(feature) -> str:
     return feature.get("properties").get("services").get("download").get("url")
 
 
-def _follow_redirect(url, session):
+def _follow_redirect(url: str, session: Session) -> str:
     response = session.head(url, allow_redirects=False)
     while response.status_code in range(300, 400):
         url = response.headers["Location"]
@@ -123,15 +131,15 @@ def _follow_redirect(url, session):
     return url
 
 
-def _get_logger(options):
+def _get_logger(options: Dict) -> NoopLogger:
     return options.get("logger") or NoopLogger()
 
 
-def _get_monitor(options):
+def _get_monitor(options: Dict) -> Union[StatusMonitor, NoopMonitor]:
     return options.get("monitor") or NoopMonitor()
 
 
-def _get_credentials(options):
+def _get_credentials(options: Dict) -> Credentials:
     return options.get("credentials") or Credentials(
         proxies=options.get("proxies", None)
     )

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool/logger.py

@@ -10,17 +10,22 @@ class NoopLogger:
     A logger that does nothing.
     """
 
-    def debug(self, *kwargs):
+    def debug(self, msg, *args, **kwargs):
         """
         Log a debug message.
         """
 
-    def info(self, *kwargs):
+    def error(self, msg, *args, **kwargs):
+        """
+        Log an error message.
+        """
+
+    def info(self, msg, *args, **kwargs):
         """
         Log an info message.
         """
 
-    def warning(self, *kwargs):
+    def warning(self, msg, *args, **kwargs):
         """
         Log a warning message.
         """

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool/monitor.py

@@ -14,12 +14,13 @@ import sys
 import os
 import signal
 import shutil
+from typing import List, Tuple, Union
 
 IS_IPYTHON = True
 
 try:
-    from IPython import get_ipython
-    from IPython.display import clear_output
+    from IPython import get_ipython  # type:ignore[reportMissingImports]
+    from IPython.display import clear_output  # type:ignore[reportMissingImports]
 
     if "IPKernelApp" not in get_ipython().config:
         IS_IPYTHON = False
@@ -46,16 +47,16 @@ class StatusMonitor(threading.Thread):
             status.add_progress(512)
     """
 
-    line_length = 80
+    line_length: int = 80
 
-    __is_running = True
-    __progress_lines = 0
+    __is_running: bool = True
+    __progress_lines: int = 0
 
-    __download_speed_deltas = []
+    __download_speed_deltas: List[int] = []
     __done = []
     __status = []
 
-    def start(self):
+    def start(self) -> None:
         """
         Start the monitor
         """
@@ -70,13 +71,13 @@ class StatusMonitor(threading.Thread):
 
         super().start()
 
-    def stop(self):
+    def stop(self) -> None:
         """
         Stop the monitor
         """
         self.__is_running = False
 
-    def status(self):
+    def status(self) -> "Status":
         """
         Returns a status bar for a single download
         """
@@ -84,14 +85,14 @@ class StatusMonitor(threading.Thread):
         self.__status.append(status)
         return status
 
-    def remove_status(self, status):
+    def remove_status(self, status: "Status") -> None:
         """
         Remove a status from the monitor, marking it as done
         """
         self.__done.append(status)
         self.__status.remove(status)
 
-    def run(self):
+    def run(self) -> None:
         """
         Main loop for the monitor, printing the status bars every second until stopped
         """
@@ -107,12 +108,12 @@ class StatusMonitor(threading.Thread):
         print("")
 
     @property
-    def __download_speed(self):
+    def __download_speed(self) -> float:
         if len(self.__download_speed_deltas) < 2:
             return 0
         return sum(self.__download_speed_deltas) / len(self.__download_speed_deltas)
 
-    def __track_download_speed(self):
+    def __track_download_speed(self) -> None:
         speed_t0 = self.__total_downloaded
         time.sleep(1)
         speed_t1 = self.__total_downloaded
@@ -120,13 +121,13 @@ class StatusMonitor(threading.Thread):
         if len(self.__download_speed_deltas) > 10:
             self.__download_speed_deltas.pop(0)
 
-    def __print_done_lines(self):
+    def __print_done_lines(self) -> None:
         for status in self.__done:
             print(status.done_line())
 
-    def __clear_progress_lines(self):
+    def __clear_progress_lines(self) -> None:
         if IS_IPYTHON:
-            clear_output(wait=True)
+            clear_output(wait=True)  # type:ignore[reportPossiblyUnboundVariable]
             return
 
         sys.stdout.write("\033[K")
@@ -139,7 +140,7 @@ class StatusMonitor(threading.Thread):
         print("")
         print("")
 
-    def __draw(self):
+    def __draw(self) -> None:
         self.__progress_lines = 1
 
         print(
@@ -149,7 +150,7 @@ class StatusMonitor(threading.Thread):
                     f"{len(self.__status)} files in progress",
                     f"{len(self.__done)} files done",
                     f"{bytes_to_human(self.__total_downloaded)} total downloaded",
-                    f"{bytes_to_human(self.__download_speed)}/s ]]",
+                    f"{bytes_to_human(int(self.__download_speed))}/s ]]",
                 ]
             )
         )
@@ -161,7 +162,7 @@ class StatusMonitor(threading.Thread):
             self.__progress_lines += 2
 
     @property
-    def __total_downloaded(self):
+    def __total_downloaded(self) -> int:
         return sum(status.downloaded for status in self.__status) + sum(
             status.size for status in self.__done
         )
@@ -179,23 +180,23 @@ class NoopMonitor:
     A monitor that does nothing
     """
 
-    def status(self):
+    def status(self) -> "Status":
         """
         Returns a status bar for a single download
         """
         return Status(self)
 
-    def remove_status(self, status):
+    def remove_status(self, status) -> None:
         """
         Remove a status from the monitor
         """
 
-    def start(self):
+    def start(self) -> None:
         """
         Start the monitor
         """
 
-    def stop(self):
+    def stop(self) -> None:
         """
         Stop the monitor
         """
@@ -212,12 +213,12 @@ class Status:
     A status bar for a single download
     """
 
-    __monitor = None
-    filename = None
-    size = 0
-    downloaded = 0
+    __monitor: Union[NoopMonitor, StatusMonitor, None] = None
+    filename: Union[str, None] = None
+    size: int = 0
+    downloaded: int = 0
 
-    def done_line(self):
+    def done_line(self) -> str:
         """
         Returns a line to print when the download is complete
         """
@@ -225,10 +226,16 @@ class Status:
             return f"{self.filename} skipped"
         return f"{self.filename} ({bytes_to_human(self.size)})"
 
-    def status_lines(self):
+    def status_lines(self) -> Tuple[str, str]:
         """
         Returns a tuple of lines to print for the status bar
         """
+        if (
+            not self.__monitor
+            or isinstance(self.__monitor, NoopMonitor)
+            or not self.filename
+        ):
+            return ("", "")
         line_length = self.__monitor.line_length
         if self.downloaded == 0:
             return (
@@ -250,35 +257,36 @@ class Status:
 
         return filename_line, progress_line
 
-    def add_progress(self, chunk_bytes):
+    def add_progress(self, chunk_bytes) -> None:
         """
         Add to the number of bytes downloaded
         """
         self.downloaded += chunk_bytes
 
-    def set_filename(self, filename):
+    def set_filename(self, filename: str) -> None:
         """
         Set the name of the file being downloaded
         """
         self.filename = filename
 
-    def set_filesize(self, size):
+    def set_filesize(self, size: int) -> None:
         """
         Set the size of the file being downloaded
         """
         self.size = size
 
-    def __init__(self, monitor):
+    def __init__(self, monitor) -> None:
         self.__monitor = monitor
 
     def __enter__(self):
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.__monitor.remove_status(self)
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        if self.__monitor:
+            self.__monitor.remove_status(self)
 
 
-def bytes_to_human(num_bytes):
+def bytes_to_human(num_bytes: int) -> str:
     """
     Convert a number of bytes to a human-readable string
     """

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

@@ -4,20 +4,21 @@ Query the Copernicus Data Space Ecosystem OpenSearch API
 https://documentation.dataspace.copernicus.eu/APIs/OpenSearch.html
 """
 
+from typing import Any, Dict, Union
 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:
-    def __init__(self, feature_query):
+    def __init__(self, feature_query) -> None:
         self.index = 0
         self.feature_query = feature_query
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self.feature_query)
 
     def __iter__(self):
@@ -40,9 +41,14 @@ class FeatureQuery:
     Queries the next batch when the current batch is exhausted.
     """
 
-    total_results = None
+    total_results: int = -1
 
-    def __init__(self, collection, search_terms, proxies=None):
+    def __init__(
+        self,
+        collection: str,
+        search_terms: Dict[str, Any],
+        proxies: Union[Dict[str, str], None] = None,
+    ) -> None:
         self.features = []
         self.proxies = proxies
         self.next_url = _query_url(
@@ -52,8 +58,8 @@ class FeatureQuery:
     def __iter__(self):
         return _FeatureIterator(self)
 
-    def __len__(self):
-        if self.total_results is None:
+    def __len__(self) -> int:
+        if self.total_results < 0:
             self.__fetch_features()
 
         return self.total_results
@@ -64,10 +70,13 @@ class FeatureQuery:
 
         return self.features[index]
 
-    def __fetch_features(self):
+    def __fetch_features(self) -> None:
         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 []
@@ -78,7 +87,7 @@ class FeatureQuery:
 
             self.__set_next_url(res)
 
-    def __set_next_url(self, res):
+    def __set_next_url(self, res) -> None:
         links = res.get("properties", {}).get("links") or []
         self.next_url = next(
             (link for link in links if link.get("rel") == "next"), {}
@@ -88,14 +97,18 @@ class FeatureQuery:
             self.next_url = self.next_url.replace("exactCount=1", "exactCount=0")
 
 
-def query_features(collection, search_terms, proxies=None):
+def query_features(
+    collection: str,
+    search_terms: Dict[str, Any],
+    proxies: Union[Dict[str, str], None] = None,
+) -> FeatureQuery:
     """
     Returns an iterator over the features matching the search terms
     """
     return FeatureQuery(collection, {"maxRecords": 2000, **search_terms}, proxies)
 
 
-def shape_to_wkt(shape):
+def shape_to_wkt(shape: str) -> str:
     """
     Convert a shapefile to a WKT string
     """
@@ -107,12 +120,11 @@ def shape_to_wkt(shape):
     )
 
 
-def geojson_to_wkt(geojson):
+def geojson_to_wkt(geojson_in: Union[str, Dict]) -> str:
     """
     Convert a geojson geometry to a WKT string
     """
-    if isinstance(geojson, str):
-        geojson = json.loads(geojson)
+    geojson = json.loads(geojson_in) if isinstance(geojson_in, str) else geojson_in
 
     if geojson.get("type") == "Feature":
         geojson = geojson["geometry"]
@@ -131,7 +143,9 @@ def geojson_to_wkt(geojson):
     return f"POLYGON({paired_coord})"
 
 
-def describe_collection(collection, proxies=None):
+def describe_collection(
+    collection: str, proxies: Union[Dict[str, str], None] = None
+) -> Dict[str, Any]:
     """
     Get a list of valid options for a given collection in key value pairs
     """
@@ -142,6 +156,8 @@ def describe_collection(collection, proxies=None):
     )
 
     parameters = {}
+    if not parameter_node_parent:
+        return parameters
     for parameter_node in parameter_node_parent:
         name = parameter_node.attrib.get("name")
         pattern = parameter_node.attrib.get("pattern")
@@ -160,7 +176,11 @@ def describe_collection(collection, proxies=None):
     return parameters
 
 
-def _query_url(collection, search_terms, proxies=None):
+def _query_url(
+    collection: str,
+    search_terms: Dict[str, Any],
+    proxies: Union[Dict[str, str], None] = None,
+) -> str:
     description = describe_collection(collection, proxies=proxies)
 
     query_list = []
@@ -175,7 +195,7 @@ def _query_url(collection, search_terms, proxies=None):
     )
 
 
-def _serialize_search_term(search_term):
+def _serialize_search_term(search_term: Any) -> str:
     if isinstance(search_term, list):
         return ",".join(search_term)
 
@@ -188,14 +208,14 @@ def _serialize_search_term(search_term):
     return str(search_term)
 
 
-def _validate_search_term(key, search_term, description):
+def _validate_search_term(key: str, search_term: str, description) -> None:
     _assert_valid_key(key, description)
     _assert_match_pattern(search_term, description.get(key).get("pattern"))
     _assert_min_inclusive(search_term, description.get(key).get("minInclusive"))
     _assert_max_inclusive(search_term, description.get(key).get("maxInclusive"))
 
 
-def _assert_valid_key(key, description):
+def _assert_valid_key(key: str, description: Dict[str, Any]) -> None:
     assert key in description.keys(), (
         f'search_term with name "{key}" '
         + "was not found for collection."
@@ -203,7 +223,7 @@ def _assert_valid_key(key, description):
     )
 
 
-def _assert_match_pattern(search_term, pattern):
+def _assert_match_pattern(search_term: str, pattern: Union[str, None]) -> None:
     if not pattern:
         return
 
@@ -212,7 +232,7 @@ def _assert_match_pattern(search_term, pattern):
     ), f"search_term {search_term} does not match pattern {pattern}"
 
 
-def _assert_min_inclusive(search_term, min_inclusive):
+def _assert_min_inclusive(search_term: str, min_inclusive: Union[str, None]) -> None:
     if not min_inclusive:
         return
 
@@ -221,7 +241,7 @@ def _assert_min_inclusive(search_term, min_inclusive):
     ), f"search_term {search_term} is less than min_inclusive {min_inclusive}"
 
 
-def _assert_max_inclusive(search_term, max_inclusive):
+def _assert_max_inclusive(search_term: str, max_inclusive: Union[str, None]) -> None:
     if not max_inclusive:
         return
 
@@ -230,24 +250,26 @@ def _assert_max_inclusive(search_term, max_inclusive):
     ), f"search_term {search_term} is greater than max_inclusive {max_inclusive}"
 
 
-_describe_docs = {}
+_describe_docs: Dict[str, bytes] = {}
 
 
-def _get_describe_doc(collection, proxies=None):
-    if _describe_docs.get(collection):
-        return _describe_docs.get(collection)
-    res = requests.get(
+def _get_describe_doc(
+    collection: str, proxies: Union[Dict[str, str], None] = None
+) -> bytes:
+    docs = _describe_docs.get(collection)
+    if docs:
+        return docs
+    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
-    return _describe_docs.get(collection)
+        _describe_docs[collection] = res.content
+        return res.content

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.9
+Version: 0.2.11
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -10,15 +10,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 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: typer<1,>=0.9
+Requires-Dist: rich<14,>=13.6
+Requires-Dist: requests<3,>=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: pytest==8.2.0; extra == "test"
+Requires-Dist: pylint==3.2.2; extra == "test"
+Requires-Dist: pytest==8.2.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: requests-mock==1.12.1; extra == "test"
 Requires-Dist: pytest-mock==3.14.0; 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.11
 ```
 
 ## Usage

{cdsetool-0.2.9 → cdsetool-0.2.11}/src/cdsetool.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/cdsetool/credentials.py
 src/cdsetool/download.py
 src/cdsetool/logger.py
 src/cdsetool/monitor.py
+src/cdsetool/py.typed
 src/cdsetool/query.py
 src/cdsetool.egg-info/PKG-INFO
 src/cdsetool.egg-info/SOURCES.txt

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

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