feat: add requests and types-requests dependencies; refactor code for clarity

Author: emmanuelmathot

.pre-commit-config.yaml

@@ -13,6 +13,7 @@ repos:
         exclude: ^(tests/.*|examples/.*|notebooks/.*)$
         additional_dependencies:
           - types-boto3
+          - types-requests
           - pystac>=1.10.0
           - httpx>=0.27.0
 

pyproject.toml

@@ -36,7 +36,8 @@ dependencies = [
     "morecantile>=5.0.0",
     "cf-xarray>=0.9.0",
     "eopf-geozarr @ git+https://github.com/EOPF-Explorer/data-model.git@new_s2",
-    
+    "requests",
+
 ]
 
 [dependency-groups]
@@ -45,6 +46,7 @@ dev = [
     "mypy>=1.11.0",
     "pre-commit>=3.7.0",
     "types-boto3>=1.0.2",
+    "types-requests",
 ]
 test = [
     "pytest>=9.0.1",

scripts/convert_v1_s2.py

@@ -113,9 +113,7 @@ def run_conversion(
     except Exception as e:
         logger.warning(f"   ⚠️  Cleanup warning: {e}")
 
-    dask_client = setup_dask_cluster(
-        enable_dask=use_dask_cluster, verbose=True
-    )
+    setup_dask_cluster(enable_dask=use_dask_cluster, verbose=True)
 
     # Load input dataset
     logger.info(f"{'   📥 Loading input dataset '}{zarr_url}")

scripts/register_v1.py

@@ -294,7 +294,7 @@ def consolidate_reflectance_assets(item: Item, geozarr_url: str, s3_endpoint: st
     # Gather all reflectance bands from old-style assets
     for key, asset in list(item.assets.items()):
         # Extract band info from individual band assets (e.g., B01_20m, B02_10m)
-        if key.startswith("B") and "_" in key and "reflectance" in asset.roles:
+        if key.startswith("B") and "_" in key and asset.roles and "reflectance" in asset.roles:
             # Parse resolution from key (e.g., B01_20m -> 20m)
             parts = key.split("_")
             if len(parts) == 2:
@@ -386,7 +386,7 @@ def consolidate_reflectance_assets(item: Item, geozarr_url: str, s3_endpoint: st
     }
 
     # Add extent if proj:bbox is available (assuming it's in projected coordinates)
-    if len(proj_bbox) >= 4 and isinstance(proj_bbox[0], (int, float)):
+    if len(proj_bbox) >= 4 and isinstance(proj_bbox[0], int | float):
         # proj:bbox might be in lat/lon, need to check if we have projected bbox
         # For now, we'll use proj:transform and proj:shape to compute extent
         proj_transform = item.properties.get("proj:transform")

submit_stac_items_notebook.ipynb

@@ -38,11 +38,9 @@
     "import json\n",
     "import os\n",
     "from pathlib import Path\n",
-    "import requests\n",
-    "\n",
     "\n",
     "import pandas as pd\n",
-    "import pika\n",
+    "import requests\n",
     "from pystac_client import Client\n",
     "\n",
     "# Try to load .env file if available\n",
@@ -428,7 +426,7 @@
     "search = catalog.search(\n",
     "    collections=[source_collection],\n",
     "    bbox=aoi_bbox,\n",
-    "    datetime=f\"{start_date}/{end_date}\" # Adjust as needed\n",
+    "    datetime=f\"{start_date}/{end_date}\",  # Adjust as needed\n",
     ")\n",
     "\n",
     "# Collect items paginated results\n",
@@ -491,7 +489,7 @@
     "\n",
     "        # Publish message with simple http post request to localhost:12000/samples\n",
     "        message = json.dumps(payload)\n",
-    "        response = requests.post(\n",
+    "        requests.post(\n",
     "            \"http://localhost:12000/samples\",\n",
     "            data=message,\n",
     "            headers={\"Content-Type\": \"application/json\"},\n",

submit_test_workflow_wh.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import json
+
 import requests
 
 # Test item that was failing (same as before)
 payload = {
     "source_url": "https://stac.core.eopf.eodc.eu/collections/sentinel-2-l2a/items/S2C_MSIL2A_20251117T090251_N0511_R007_T35SMA_20251117T124014",
     "collection": "sentinel-2-l2a-dp-test",
-    "action": "convert-v1-s2-hp", # specify the action to use the S2 high-priority trigger
+    "action": "convert-v1-s2-hp",  # specify the action to use the S2 high-priority trigger
 }
 
 # credentials = pika.PlainCredentials("user", os.getenv("RABBITMQ_PASSWORD"))

tests/test_consolidate_reflectance.py

@@ -38,7 +38,7 @@ def has_old_format_assets(item: Item) -> bool:
             and "_" in key
             and any(key.endswith(f"_{res}") for res in ["10m", "20m", "60m"])
         )
-        for key in item.assets.keys()
+        for key in item.assets
     )
 
 
@@ -78,7 +78,7 @@ def test_after_consolidation_no_old_format_assets(self, stac_item):
         )
 
         # Verify no old-format assets remain
-        for key in stac_item.assets.keys():
+        for key in stac_item.assets:
             assert not key.startswith("SR_"), f"SR_ asset {key} should be removed"
             assert not (
                 key.startswith("B")