Skip to content

fix: consistent spatial chunking for Sentinel-2 multiscales - #331

Merged
claxn merged 2 commits into
mainfrom
fix/consistent-ms-chunking
Oct 29, 2026
Merged

claxn merged 2 commits into
mainfrom
fix/consistent-ms-chunking

Conversation

@claxn

@claxn claxn commented Oct 28, 2026

Copy link
Copy Markdown
Collaborator

Before this fix, the desired spatial chunking (e.g. 1024) was not applied on Sentinel-2 multiscaled arrays, only on native ones. Now generic_multiscales applies the spatial_chunk parameter consistently to all arrays. This PR is meant to be stacked on #328.

@claxn claxn self-assigned this Oct 28, 2026
@claxn claxn added the bug Something isn't working label Oct 28, 2026
@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Security Audit Report

View workflow run

Bandit — Static Security Analysis (Security tab)

12 issue(s) found: 1 medium, 11 low

✅ No issues at or above HIGH severity.

1 medium, 11 low issue(s) below threshold not shown in table.

pip-audit — Dependency Vulnerabilities (Security tab)

Dependencies audited: 121, skipped: 0.

Package Version ID Fix Versions Description
tornado 6.5.9 CVE-2026-116577 6.6 ### Summary Tornado's HTTP header parser takes quadratic time (O(n²)) when a header value is continued across many "obs
tornado 6.5.9 CVE-2026-115927 6.6 ### Summary When Tornado reads an HTTP/1.1 body that uses chunked transfer encoding, it processes all chunks that have
tornado 6.5.9 CVE-2026-116578 6.6 ### Summary tornado.web.RedirectHandler builds its target URL by substituting parts of the request path into a templa

3 vulnerability/vulnerabilities found (3 fixable) across 1 package(s).


Result: ❌ Blocking issues found — see details above.

@claxn
claxn marked this pull request as ready for review October 28, 2026 23:40
claudio.schein-navacchi and others added 2 commits October 29, 2026 13:05
@claxn
claxn force-pushed the fix/consistent-ms-chunking branch from cdd2bb7 to 4a35d85 Compare October 29, 2026 12:06
@claxn
claxn merged commit 1661ae2 into main Oct 29, 2026
7 checks passed
d-v-b added a commit to d-v-b/data-model that referenced this pull request Oct 29, 2026
…to feat/pydantic-zarr-scoped-validation

Resolves the conflicts between this branch's plan-driven S2 pipeline and
upstream's root-consolidation harmonization (EOPF-Explorer#328) and spatial-chunking fix
(EOPF-Explorer#331):

- convert_s2_optimized now feeds the planned dataset index into the
  harmonized utils.updated_root_consolidation, passing the plan's None-mapped
  multiscale roots as additional_consolidate_paths; the converter-local
  simple_root_consolidation, add_multiscale_pyramids_to_stac_metadata and
  write_store_root_bbox are gone, and add_s2_stac_assets (from EOPF-Explorer#328) is
  adapted to take the index and the planned reflectance shape.
- utils.add_multiscale_pyramids_to_stac_metadata accepts a dataset's variable
  names in place of the dataset, which is what the plan-driven converter has.
- convert_s2 and the DataTree-writer code EOPF-Explorer#328/EOPF-Explorer#331 touched stay deleted
  (no remaining callers); max_retries leaves convert_s2_optimized as upstream
  removed it from the call sites.
- tests follow: the consolidation tests run against updated_root_consolidation
  with explicit None roots, upstream's revived test_s2_multiscale_geo_metadata
  (now against conversion.utils) is kept, and the DataTree-writer tests stay
  deleted.
- uv.lock re-locked: upstream's bumps plus this branch's pinned pydantic-zarr
  commit; the regenerated plan snapshots are byte-identical to the merged
  files, so both pipelines had converged on the same output.

Assisted-by: ClaudeCode:claude-fable-5

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants