Repository navigation
Conversation
- Import the Zarr contracts from biomero_schema.zarr; biomero.zarr_contracts is removed from core. - Import the metadata view functions from biomero.metadata_views (renamed from biomero.provenance) and format reduced values with core's format_large_field_reference, so core recognises them on refresh. - Move the Blueprint workflow color to SLURM_Run_Workflow.py, which forwards the resolved color to the result scripts. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
- Fail with a clear message when the installed biomero predates biomero.metadata_views; README states the minimum core release. - Move the colour palette to the module constants area of the runner. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Independent review summaryReviewer: Sonnet 5.5 subagent that did not write the change (read-only, 68 mutation checks across the three PRs). Verdict: no blockers.
Harness run locally against this branch with the updated #89 tests: 493 passed, 7 skipped. This PR's own CI stays red until #89 is merged (shared harness). |
The workflow runner now owns the cleanup of .biomero-input.json: after the result import succeeded it removes the marker from the imported result folder. SLURM_Import_Results.py reports that folder as the Results_Path output. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
biomero.zarr_contracts is being removed from core; the marker constant is defined in biomero_schema.zarr, which the scripts already import. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…ogether Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The harness still expects the CanonicalInput import from biomero.zarr_contracts until #88 and its tests merge; only the new TRANSFER_INPUT_MARKER import comes from biomero_schema.zarr. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Accept only .analyzed/<workflow>/<timestamp>, never fail the run on a cleanup error, warn on unreadable folders, drop unreachable parameters, name the shallow storage condition and document the Results_Path output. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Both scripts take RESULTS_PATH_OUTPUT from core (biomero#110), like WORKFLOW_UUID_OUTPUT, instead of defining it locally. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Resolve the gated import block with #97 (the input marker cleanup, which merges first) to `from biomero_schema.zarr import CanonicalInput, TRANSFER_INPUT_MARKER`. Name the released minimum core version (2.9.0b26) in the README and in the import error messages. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…er>=1.5.0b14 The merge is clean. The scripts declared no importer minimum anywhere, so the README now names biomero-importer>=1.5.0b14 (it provides the PROCESSED_DATA_FOLDER and sidecar helpers this PR imports). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Conflicts with the PRs that merge before this one, resolved by taking their code and applying the same mechanical replacement of output-name literals with biomero.constants.results.*_OUTPUT: - SLURM_Run_Workflow.py: keep RESULTS_FOLDER_NAME and ZARR_ROOT_FILES from #97, drop the local CANONICAL_INPUTS_OUTPUT; the export, conversion and import stages of #90 use MESSAGE_OUTPUT, URL_OUTPUT and FILE_ANNOTATION_OUTPUT. - SLURM_Run_Workflow_Batched.py: use #90's register_detached_batches and MESSAGE_OUTPUT for the launcher message. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The input marker cleanup (#97) merges before the Zarr contract move (#88) and already imports its marker name from biomero_schema.zarr next to the remaining biomero.zarr_contracts import. Count a script with any old-form import as the old form, so the harness passes for source with and without that cleanup. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
* Tests: schema imports, metadata view imports and workflow color in the runner Capability-gated: they follow the source revision that imports biomero_schema.zarr and biomero.metadata_views, and skip or fall back for older revisions. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * Tests: wrap-around colours, forwarding, literal reduced text, strict gates Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * Accept the partly migrated import block of the input marker cleanup The input marker cleanup (#97) merges before the Zarr contract move (#88) and already imports its marker name from biomero_schema.zarr next to the remaining biomero.zarr_contracts import. Count a script with any old-form import as the old form, so the harness passes for source with and without that cleanup. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
…e stores The result folder is the ANALYZED_DATA_FOLDER setting (read_analyzed_data_folder), not a local constant. The marker sits at the root of each exported store, one level below the result folder, so the sweep no longer detects Zarr stores. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Scripts and core are released together, so the README and the import error name the renamed module, not a version floor. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Independent reviewScope: only the forward-merge commit 8425807 ("Merge #97 into provenance-views-cleanup; state no minimum core version"), compared with both parents (9c4344c and #97 head dfc2243) via Verdict: the merge is correct. No blocking findings.
🤖 Generated with Claude Code |
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
|
Resolved in 5714bb4: #97 (866958e) merged in, clean. The 🤖 Generated with Claude Code |
…the folder name Core will not provide an ANALYZED_DATA_FOLDER setting for 1.8 (tracked in NL-BIOMERO#111). SLURM_Import_Results.py keeps one RESULTS_FOLDER constant, and the marker sweep accepts only a result folder of this run's workflow: <...>/<workflow id>/<timestamp>. No general constants remain in the run script. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Independent reviewReviewer: independent agent. Scope: the latest forward-merge commit of this branch (329487a) only (conflict resolution), plus a repository-wide search; the PR's own change was reviewed in its original review. Verdict: approve the forward merge. No blocking, no should fix.
🤖 Generated with Claude Code |
…d exact scope-check wording Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
|
Resolved in 34d9fa5: #97 (d0499b5) merged in, clean. 🤖 Generated with Claude Code |
Closes #87
Refs NL-BioImaging/NL-BIOMERO#93
Scripts side of the core clean-up in NL-BioImaging/biomero (provenance views, projections and schema re-exports).
Changes
_SLURM_Image_Transfer.pyandSLURM_Run_Workflow.pyimport the Zarr contracts frombiomero_schema.zarr(core'sbiomero.zarr_contractsre-export is removed).SLURM_Get_Results.py,SLURM_Import_Results.pyandSLURM_Init_environment.pyimport frombiomero.metadata_views(renamed frombiomero.provenance; core removes the old name, which only existed in prereleases). README updated.format_large_field_reference, so core recognises exactly that text when it refreshes the view and keeps it reduced. The text itself is unchanged.QUALITATIVE_COLOR_SCHEME,resolve_workflow_color) moves frombiomero.constantstoSLURM_Run_Workflow.py, which already owns the canonical import parameters and forwards the resolved colour (ROI_Color) to the result scripts.Minimum core release
These scripts need the matching core release, which contains NL-BioImaging/biomero#104 (it provides
biomero.metadata_viewsandformat_large_field_reference, and no longer hasbiomero.provenance,biomero.zarr_contractsorconstants.resolve_workflow_color). Scripts and core are released together, so no minimum version is stated: the README names the renamedbiomero.metadata_views, and the three import error messages say that the matching release is needed.Conflict with #97 (merges first): the gated import block in
SLURM_Run_Workflow.py, resolved in this branch tofrom biomero_schema.zarr import CanonicalInput, TRANSFER_INPUT_MARKER.Release notes: Scripts import the Zarr contracts from
biomero_schema.zarrand the metadata views frombiomero.metadata_views; the workflow ROI colour is chosen bySLURM_Run_Workflow.py. Requires the matching biomero release.Behaviour change
SLURM_Get_Results.py/SLURM_Import_Results.pyuse the forwardedROI_Coloras given. When a result script is run on its own with an empty colour, it no longer derives a per-workflow colour; Labels2Rois then applies its own default (empty means no explicit colour). Runs throughSLURM_Run_Workflow.pyare unchanged (it always forwards the resolved colour when ROIs are requested). Explicit invalid colours are still rejected (by the runner and by Labels2Rois).Merge order (production and test PRs, interleaved)
Each step keeps
masterCI green: every (production state, test-suite state) pair on this path was run locally with core 2.9.0b26 from PyPI (482, 484, 484, 513, 524, 588, 594, 597, 606 passed; no failures). The production PRs merge cleanly in this order: each branch already contains the conflict resolutions with the PRs before it.test-suite:biomero>=2.9.0b26,<3intests/requirements.txt, so core-dependent tests run in CI)masterand for the new source)masterbefore Remove the input marker from results after import on every path #97, by design)A production PR's own check stays red until the test PRs before it in this list are merged (CI runs the shared harness from
test-suite, which is not pinned); merge the test PR, then rerun the check.🤖 Generated with Claude Code