cdsetool 0.2.13__tar.gz → 0.3.2__tar.gz

{cdsetool-0.2.13 → cdsetool-0.3.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Styrelsen for Dataforsyning og Infrastruktur
+Copyright (c) 2023-2025 CDSETool Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{cdsetool-0.2.13/src/cdsetool.egg-info → cdsetool-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cdsetool
-Version: 0.2.13
+Version: 0.3.2
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/CDSETool/CDSETool
@@ -11,17 +11,17 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer<1,>=0.9
-Requires-Dist: rich<14,>=13.6
+Requires-Dist: rich<16,>=13.6
 Requires-Dist: requests<3,>=2.28.1
-Requires-Dist: pyjwt[crypto]<2.10,>=2.8
+Requires-Dist: pyjwt[crypto]<2.15,>=2.8
 Requires-Dist: geopandas>=0.13.2
 Provides-Extra: test
-Requires-Dist: pylint==3.3.1; extra == "test"
-Requires-Dist: pytest==8.3.3; extra == "test"
-Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pylint==3.3.9; extra == "test"
+Requires-Dist: pytest==8.4.2; extra == "test"
+Requires-Dist: pytest-cov==7.1.0; extra == "test"
 Requires-Dist: requests-mock==1.12.1; extra == "test"
-Requires-Dist: ruff==0.6.6; extra == "test"
-Requires-Dist: pytest-mock==3.14.0; extra == "test"
+Requires-Dist: pytest-mock==3.15.1; extra == "test"
+Dynamic: license-file
 
 # CDSETool
 
@@ -38,12 +38,11 @@ from cdsetool.monitor import StatusMonitor
 from datetime import date
 
 features = query_features(
-    "Sentinel1",
+    "SENTINEL-1",
     {
-        "startDate": "2020-12-20",
-        "completionDate": date(2020, 12, 25),
+        "contentDateStartGe": "2020-12-20",
+        "contentDateStartLe": date(2020, 12, 25),
         "processingLevel": "LEVEL1",
-        "sensorMode": "IW",
         "productType": "IW_GRDH_1S",
         "geometry": shape_to_wkt("path/to/shapefile.shp"),
     },
@@ -65,9 +64,9 @@ list(
 Or use the CLI:
 
 ```bash
-cdsetool query search Sentinel2 --search-term startDate=2020-01-01 --search-term completionDate=2020-01-10 --search-term processingLevel=S2MSI2A --search-term box="4","51","4.5","52"
+cdsetool query search SENTINEL-2 --search-term contentDateStartGe=2020-01-01 --search-term contentDateStartLe=2020-01-10 --search-term productType=S2MSI2A
 
-cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=2020-01-01 --search-term completionDate=2020-01-10 --search-term processingLevel=S2MSI2A --search-term box="4","51","4.5","52"
+cdsetool download SENTINEL-2 PATH/TO/DIR --concurrency 4 --search-term contentDateStartGe=2020-01-01 --search-term contentDateStartLe=2020-01-10 --search-term productType=S2MSI2A
 ```
 
 ## Table of Contents
@@ -76,7 +75,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
   * [About CDSETool](#about-cdsetool)
   * [Quick Start](#quick-start)
   * [Table of Contents](#table-of-contents)
-  * [Installatson](#installation)
+  * [Installation](#installation)
   * [Usage](#usage)
     + [Querying features](#querying-features)
       - [Querying by shapes](#querying-by-shapes)
@@ -96,29 +95,31 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.13
+pip install cdsetool==0.3.2
 ```
 
 ## Usage
 
 ### Querying features
 
-Querying is always done in batches, returning `len(results) <= maxRecords` records each time.
+Querying is always done in batches, returning `len(results) <= top` records each time.
 A local buffer is filled and gradually emptied as results are yielded. When the buffer is empty,
 more results will be requested and the process repeated until no more results are available, or
 the iterator is discarded.
 
+**Important**: The API has a pagination limit of 10,000 results per query. If your query returns more results, you'll need to narrow your search criteria (e.g., use smaller date ranges).
+
 Since downloading features is the most common use-case, `query_features` assumes that the query will run till the end.
-Because of this, the batch size is set to `2000`, which is the size limit set by CDSE.
+Because of this, the batch size is set to `1000`, which is the size limit set by CDSE.
 
 ```python
 from cdsetool.query import query_features
 
-collection = "Sentinel2"
+collection = "SENTINEL-2"
 search_terms = {
-    "maxRecords": "100", # batch size, between 1 and 2000 (default: 2000).
-    "startDate": "1999-01-01",
-    "processingLevel": "S2MSI1C"
+    "top": 100,  # batch size, between 1 and 1000 (default: 1000)
+    "contentDateStartGe": "2024-01-01",
+    "productType": "S2MSI1C"
 }
 
 # wait for a single batch to finish, yield results immediately
@@ -136,7 +137,53 @@ featureB = next(iterator)
 # ...
 ```
 
-#### Querying by shapes
+#### Query Options
+
+**Product Format**
+
+Query results are returned directly from the Copernicus API. Each product has the following structure:
+
+```python
+product = {
+    "Id": "uuid-string",
+    "Name": "S2A_MSIL2A_20240110T105421_...",
+    "Collection": "SENTINEL-2",
+    "ContentDate": {"Start": "2024-01-10T10:54:21Z", "End": "..."},
+    "Online": True,
+    "ContentLength": 1043654649,
+    "GeoFootprint": {"type": "Polygon", "coordinates": [...]},
+    "Attributes": [
+        {"Name": "productType", "Value": "S2MSI2A"},
+        {"Name": "cloudCover", "Value": 5.2},
+        ...,
+    ],
+}
+```
+
+**Expand Product Attributes**
+
+By default, query results do not include product attributes (productType, cloudCover, platform, instrument, etc.). To include product attributes, you need to request this from the server using the option `expand_attributes` and can then access the attributes using the function `get_product_attribute()`:
+
+```python
+from cdsetool.query import query_features, get_product_attribute
+
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01"},
+    options={"expand_attributes": True},
+)
+feature = features[0]
+
+# Access basic properties directly
+print(feature["Name"])  # Product name
+print(feature["Id"])  # Product UUID
+
+# Access attributes using helper function
+cloud_cover = get_product_attribute(feature, "cloudCover")
+product_type = get_product_attribute(feature, "productType")
+```
+
+#### Querying by geometry
 
 To query by shapes, you must first convert your shape to Well Known Text (WKT). The included
 `shape_to_wkt` can solve this.
@@ -145,8 +192,7 @@ To query by shapes, you must first convert your shape to Well Known Text (WKT).
 from cdsetool.query import query_features, shape_to_wkt
 
 geometry = shape_to_wkt("path/to/shape.shp")
-
-features = query_features("Sentinel3", {"geometry": geometry})
+features = query_features("SENTINEL-3", {"geometry": geometry})
 ```
 
 #### Querying by lists of parameters
@@ -160,7 +206,7 @@ from cdsetool.query import query_features
 tile_ids = ["32TPT", "32UPU", "32UPU", "31RFL", "37XDA"]
 
 for tile_id in tile_ids:
-    features = query_features("Sentinel2", {"tileId": tile_id})
+    features = query_features("SENTINEL-2", {"tileId": tile_id})
     for feature in features:
         # do things with feature
 ```
@@ -169,14 +215,44 @@ for tile_id in tile_ids:
 
 Its quite common to query for features created before, after or between dates.
 
+Search terms support comparison operator suffixes:
+
+| Suffix | Meaning                    | Example              |
+|--------|----------------------------|----------------------|
+| `Eq`   | equals (=)                 | `contentDateStartEq` |
+| `Gt`   | greater than (>)           | `contentDateStartGt` |
+| `Ge`   | greater than or equal (>=) | `contentDateStartGe` |
+| `Lt`   | less than (<)              | `contentDateStartLt` |
+| `Le`   | less than or equal (<=)    | `contentDateStartLe` |
+
+`Eq` can be applied on any field but the other suffixes can only be applied to numeric and date fields.
+
+Interval syntax is only allowed on the base name, not on suffixed variants, and only on numeric and date fields.
+
+| Interval notation | Suffixes to combine | Meaning                        |
+|-------------------|---------------------|--------------------------------|
+| [a, b]            | `Ge` + `Le`         | a <= value <= b (closed)       |
+| (a, b)            | `Gt` + `Lt`         | a < value < b  (open)          |
+| [a, b)            | `Ge` + `Lt`         | a <= value < b (half-open)     |
+| (a, b]            | `Gt` + `Le`         | a < value <= b (half-open)     |
+
 ```python
 from cdsetool.query import query_features
 from datetime import date, datetime
 
-date_from = date(2020, 1, 1) # or datetime(2020, 1, 1, 23, 59, 59, 123456) or "2020-01-01" or "2020-01-01T23:59:59.123456Z"
+date_from = date(
+    2020, 1, 1
+)  # or datetime(2020, 1, 1, 23, 59, 59, 123456) or "2020-01-01" or "2020-01-01T23:59:59.123456Z"
 date_to = date(2020, 12, 31)
 
-features = query_features("Sentinel2", {"startDate": date_from, "completionDate": date_to})
+features = query_features(
+    "SENTINEL-2",
+    {
+        "contentDateStartGe": date_from,
+        "contentDateStartLe": date_to,
+        "cloudCover": "[0, 30]",
+    },
+)
 ```
 
 #### Listing search terms
@@ -187,13 +263,13 @@ use the CLI:
 ```python
 from cdsetool.query import describe_collection
 
-search_terms = describe_collection("Sentinel2").keys()
+search_terms = describe_collection("SENTINEL-2").keys()
 print(search_terms)
 ```
 
 And the CLI:
 ```bash
-$ cdsetool query search-terms Sentinel2
+$ cdsetool query search-terms SENTINEL-2
 ```
 
 ### Downloading features
@@ -240,7 +316,7 @@ Credentials can be validated using the `validate_credentials` function which wil
 ```python
 from cdsetool.credentials import validate_credentials
 
-validate_credentials(username='user', password='password')
+validate_credentials(username="user", password="password")
 ```
 
 If None are passed to username and password, `validate_credentials` will validate `.netrc`
@@ -257,7 +333,10 @@ The downloaded feature ids are yielded, so its required to await the results.
 from cdsetool.query import query_features
 from cdsetool.download import download_features
 
-features = query_features("Sentinel2")
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+)
 
 download_path = "/path/to/download/folder"
 downloads = download_features(features, download_path, {"concurrency": 4})
@@ -278,13 +357,47 @@ Its possible to download features sequentially in a single thread if desired.
 from cdsetool.query import query_features
 from cdsetool.download import download_feature
 
-features = query_features("Sentinel2")
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+)
 
 download_path = "/path/to/download/folder"
 for feature in features:
     download_feature(feature, download_path)
 ```
 
+#### Download specific files within features
+
+It's possible to download specific files within products bundles using Unix filename pattern matching.
+
+It can be used in CDSETool:
+
+- Through the `filter_pattern` option of `download_features` and `download_feature`:
+    ```python
+    from cdsetool.query import query_features
+    from cdsetool.download import download_features
+
+    features = query_features(
+        "SENTINEL-2",
+        {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+    )
+
+    download_path = "/path/to/download/folder"
+    filter_pattern = "*TCI.jp2"
+    downloads = download_features(
+        features, download_path, {"filter_pattern": filter_pattern}
+    )
+
+    for id in downloads:
+        print(f"feature {id} downloaded")
+    ```
+
+- Or through the CLI:
+    ```
+    cdsetool download SENTINEL-2 PATH/TO/DIR --filter-pattern *TCI.jp2 --concurrency 4 --search-term contentDateStartGe=2024-01-01 --search-term contentDateStartLe=2024-01-10 --search-term productType=S2MSI2A
+    ```
+
 ## Roadmap
 
 - [X] Query schema validation

{cdsetool-0.2.13 → cdsetool-0.3.2}/README.md

@@ -13,12 +13,11 @@ from cdsetool.monitor import StatusMonitor
 from datetime import date
 
 features = query_features(
-    "Sentinel1",
+    "SENTINEL-1",
     {
-        "startDate": "2020-12-20",
-        "completionDate": date(2020, 12, 25),
+        "contentDateStartGe": "2020-12-20",
+        "contentDateStartLe": date(2020, 12, 25),
         "processingLevel": "LEVEL1",
-        "sensorMode": "IW",
         "productType": "IW_GRDH_1S",
         "geometry": shape_to_wkt("path/to/shapefile.shp"),
     },
@@ -40,9 +39,9 @@ list(
 Or use the CLI:
 
 ```bash
-cdsetool query search Sentinel2 --search-term startDate=2020-01-01 --search-term completionDate=2020-01-10 --search-term processingLevel=S2MSI2A --search-term box="4","51","4.5","52"
+cdsetool query search SENTINEL-2 --search-term contentDateStartGe=2020-01-01 --search-term contentDateStartLe=2020-01-10 --search-term productType=S2MSI2A
 
-cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=2020-01-01 --search-term completionDate=2020-01-10 --search-term processingLevel=S2MSI2A --search-term box="4","51","4.5","52"
+cdsetool download SENTINEL-2 PATH/TO/DIR --concurrency 4 --search-term contentDateStartGe=2020-01-01 --search-term contentDateStartLe=2020-01-10 --search-term productType=S2MSI2A
 ```
 
 ## Table of Contents
@@ -51,7 +50,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
   * [About CDSETool](#about-cdsetool)
   * [Quick Start](#quick-start)
   * [Table of Contents](#table-of-contents)
-  * [Installatson](#installation)
+  * [Installation](#installation)
   * [Usage](#usage)
     + [Querying features](#querying-features)
       - [Querying by shapes](#querying-by-shapes)
@@ -71,29 +70,31 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.13
+pip install cdsetool==0.3.2
 ```
 
 ## Usage
 
 ### Querying features
 
-Querying is always done in batches, returning `len(results) <= maxRecords` records each time.
+Querying is always done in batches, returning `len(results) <= top` records each time.
 A local buffer is filled and gradually emptied as results are yielded. When the buffer is empty,
 more results will be requested and the process repeated until no more results are available, or
 the iterator is discarded.
 
+**Important**: The API has a pagination limit of 10,000 results per query. If your query returns more results, you'll need to narrow your search criteria (e.g., use smaller date ranges).
+
 Since downloading features is the most common use-case, `query_features` assumes that the query will run till the end.
-Because of this, the batch size is set to `2000`, which is the size limit set by CDSE.
+Because of this, the batch size is set to `1000`, which is the size limit set by CDSE.
 
 ```python
 from cdsetool.query import query_features
 
-collection = "Sentinel2"
+collection = "SENTINEL-2"
 search_terms = {
-    "maxRecords": "100", # batch size, between 1 and 2000 (default: 2000).
-    "startDate": "1999-01-01",
-    "processingLevel": "S2MSI1C"
+    "top": 100,  # batch size, between 1 and 1000 (default: 1000)
+    "contentDateStartGe": "2024-01-01",
+    "productType": "S2MSI1C"
 }
 
 # wait for a single batch to finish, yield results immediately
@@ -111,7 +112,53 @@ featureB = next(iterator)
 # ...
 ```
 
-#### Querying by shapes
+#### Query Options
+
+**Product Format**
+
+Query results are returned directly from the Copernicus API. Each product has the following structure:
+
+```python
+product = {
+    "Id": "uuid-string",
+    "Name": "S2A_MSIL2A_20240110T105421_...",
+    "Collection": "SENTINEL-2",
+    "ContentDate": {"Start": "2024-01-10T10:54:21Z", "End": "..."},
+    "Online": True,
+    "ContentLength": 1043654649,
+    "GeoFootprint": {"type": "Polygon", "coordinates": [...]},
+    "Attributes": [
+        {"Name": "productType", "Value": "S2MSI2A"},
+        {"Name": "cloudCover", "Value": 5.2},
+        ...,
+    ],
+}
+```
+
+**Expand Product Attributes**
+
+By default, query results do not include product attributes (productType, cloudCover, platform, instrument, etc.). To include product attributes, you need to request this from the server using the option `expand_attributes` and can then access the attributes using the function `get_product_attribute()`:
+
+```python
+from cdsetool.query import query_features, get_product_attribute
+
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01"},
+    options={"expand_attributes": True},
+)
+feature = features[0]
+
+# Access basic properties directly
+print(feature["Name"])  # Product name
+print(feature["Id"])  # Product UUID
+
+# Access attributes using helper function
+cloud_cover = get_product_attribute(feature, "cloudCover")
+product_type = get_product_attribute(feature, "productType")
+```
+
+#### Querying by geometry
 
 To query by shapes, you must first convert your shape to Well Known Text (WKT). The included
 `shape_to_wkt` can solve this.
@@ -120,8 +167,7 @@ To query by shapes, you must first convert your shape to Well Known Text (WKT).
 from cdsetool.query import query_features, shape_to_wkt
 
 geometry = shape_to_wkt("path/to/shape.shp")
-
-features = query_features("Sentinel3", {"geometry": geometry})
+features = query_features("SENTINEL-3", {"geometry": geometry})
 ```
 
 #### Querying by lists of parameters
@@ -135,7 +181,7 @@ from cdsetool.query import query_features
 tile_ids = ["32TPT", "32UPU", "32UPU", "31RFL", "37XDA"]
 
 for tile_id in tile_ids:
-    features = query_features("Sentinel2", {"tileId": tile_id})
+    features = query_features("SENTINEL-2", {"tileId": tile_id})
     for feature in features:
         # do things with feature
 ```
@@ -144,14 +190,44 @@ for tile_id in tile_ids:
 
 Its quite common to query for features created before, after or between dates.
 
+Search terms support comparison operator suffixes:
+
+| Suffix | Meaning                    | Example              |
+|--------|----------------------------|----------------------|
+| `Eq`   | equals (=)                 | `contentDateStartEq` |
+| `Gt`   | greater than (>)           | `contentDateStartGt` |
+| `Ge`   | greater than or equal (>=) | `contentDateStartGe` |
+| `Lt`   | less than (<)              | `contentDateStartLt` |
+| `Le`   | less than or equal (<=)    | `contentDateStartLe` |
+
+`Eq` can be applied on any field but the other suffixes can only be applied to numeric and date fields.
+
+Interval syntax is only allowed on the base name, not on suffixed variants, and only on numeric and date fields.
+
+| Interval notation | Suffixes to combine | Meaning                        |
+|-------------------|---------------------|--------------------------------|
+| [a, b]            | `Ge` + `Le`         | a <= value <= b (closed)       |
+| (a, b)            | `Gt` + `Lt`         | a < value < b  (open)          |
+| [a, b)            | `Ge` + `Lt`         | a <= value < b (half-open)     |
+| (a, b]            | `Gt` + `Le`         | a < value <= b (half-open)     |
+
 ```python
 from cdsetool.query import query_features
 from datetime import date, datetime
 
-date_from = date(2020, 1, 1) # or datetime(2020, 1, 1, 23, 59, 59, 123456) or "2020-01-01" or "2020-01-01T23:59:59.123456Z"
+date_from = date(
+    2020, 1, 1
+)  # or datetime(2020, 1, 1, 23, 59, 59, 123456) or "2020-01-01" or "2020-01-01T23:59:59.123456Z"
 date_to = date(2020, 12, 31)
 
-features = query_features("Sentinel2", {"startDate": date_from, "completionDate": date_to})
+features = query_features(
+    "SENTINEL-2",
+    {
+        "contentDateStartGe": date_from,
+        "contentDateStartLe": date_to,
+        "cloudCover": "[0, 30]",
+    },
+)
 ```
 
 #### Listing search terms
@@ -162,13 +238,13 @@ use the CLI:
 ```python
 from cdsetool.query import describe_collection
 
-search_terms = describe_collection("Sentinel2").keys()
+search_terms = describe_collection("SENTINEL-2").keys()
 print(search_terms)
 ```
 
 And the CLI:
 ```bash
-$ cdsetool query search-terms Sentinel2
+$ cdsetool query search-terms SENTINEL-2
 ```
 
 ### Downloading features
@@ -215,7 +291,7 @@ Credentials can be validated using the `validate_credentials` function which wil
 ```python
 from cdsetool.credentials import validate_credentials
 
-validate_credentials(username='user', password='password')
+validate_credentials(username="user", password="password")
 ```
 
 If None are passed to username and password, `validate_credentials` will validate `.netrc`
@@ -232,7 +308,10 @@ The downloaded feature ids are yielded, so its required to await the results.
 from cdsetool.query import query_features
 from cdsetool.download import download_features
 
-features = query_features("Sentinel2")
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+)
 
 download_path = "/path/to/download/folder"
 downloads = download_features(features, download_path, {"concurrency": 4})
@@ -253,13 +332,47 @@ Its possible to download features sequentially in a single thread if desired.
 from cdsetool.query import query_features
 from cdsetool.download import download_feature
 
-features = query_features("Sentinel2")
+features = query_features(
+    "SENTINEL-2",
+    {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+)
 
 download_path = "/path/to/download/folder"
 for feature in features:
     download_feature(feature, download_path)
 ```
 
+#### Download specific files within features
+
+It's possible to download specific files within products bundles using Unix filename pattern matching.
+
+It can be used in CDSETool:
+
+- Through the `filter_pattern` option of `download_features` and `download_feature`:
+    ```python
+    from cdsetool.query import query_features
+    from cdsetool.download import download_features
+
+    features = query_features(
+        "SENTINEL-2",
+        {"contentDateStartGe": "2024-01-01", "contentDateStartLe": "2024-01-10"},
+    )
+
+    download_path = "/path/to/download/folder"
+    filter_pattern = "*TCI.jp2"
+    downloads = download_features(
+        features, download_path, {"filter_pattern": filter_pattern}
+    )
+
+    for id in downloads:
+        print(f"feature {id} downloaded")
+    ```
+
+- Or through the CLI:
+    ```
+    cdsetool download SENTINEL-2 PATH/TO/DIR --filter-pattern *TCI.jp2 --concurrency 4 --search-term contentDateStartGe=2024-01-01 --search-term contentDateStartLe=2024-01-10 --search-term productType=S2MSI2A
+    ```
+
 ## Roadmap
 
 - [X] Query schema validation

{cdsetool-0.2.13 → cdsetool-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdsetool"
-version = "0.2.13"
+version = "0.3.2"
 authors = [
   { name="Jacob Vejby", email="javej@sdfi.dk" },
 ]
@@ -17,19 +17,24 @@ classifiers = [
 ]
 dependencies = [
   "typer >= 0.9,< 1",
-  "rich >= 13.6,< 14",
+  "rich >= 13.6,< 16",
   "requests >= 2.28.1,< 3",
-  "pyjwt[crypto] >= 2.8,< 2.10",
+  "pyjwt[crypto] >= 2.8,< 2.15",
   "geopandas >= 0.13.2",
 ]
+[dependency-groups]
+dev = [
+    "ruff==0.16.7",
+]
+# (Jan 30 2025) Pip does not support dependency-groups yet, so
+# leave the optional dependencies for everything except Ruff.
 [project.optional-dependencies]
 test = [
-    "pylint==3.3.1",
-    "pytest==8.3.3",
-    "pytest-cov==5.0.0",
+    "pylint==3.3.9",
+    "pytest==8.4.2",
+    "pytest-cov==7.1.0",
     "requests-mock==1.12.1",
-    "ruff==0.6.6",
-    "pytest-mock==3.14.0",
+    "pytest-mock==3.15.1",
 ]
 
 [project.urls]
@@ -46,11 +51,15 @@ max-locals = 20
 max-line-length = "88"
 disable="fixme"
 
+[tool.pylint.imports]
+disable="wrong-import-order"
+
 [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
+# reportMissingParameterType = true
 typeCheckingMode = "standard"
 
 executionEnvironments = [
@@ -61,3 +70,8 @@ executionEnvironments = [
 addopts = [
     "--import-mode=importlib",
 ]
+
+[tool.ruff.lint]
+select = [
+    "I", # isort
+]