Repository navigation
0.4.0: the ScanImage JSON connector moves to the private 2P rig repo (draft, after #3) - #4
Merged
Merged
Conversation
The imaging (2P / ScanImage) work is now kept in reiserlab/scanimage-2026-bergamo `2p-rig-nodes/` (Michael's decision, 2026-10-28). Removed here: scanimage_node, scanimage_cmd, sims/si_json_mock, their console scripts (rig-scanimage-node, rig-scanimage-cmd, rig-si-mock) and pixi tasks, the ScanImage group of test_device_nodes.py, the ScanImage command/status vocabulary in CONTRACT.md §2/§4, port 5555 and the Bergamo PC host notes in SETUP.md (one pointer line kept). Kept: the generic /<src>/cmd|reply|status contract, ConnectorReply and the outcome vocabulary. A contract change, so package set 0.4.0 (CONTRACT version line says unreleased; the version bump and channel payload belong to the release commit). Stacked on release/0.3.0 (#3). The private copy carries #261's --frame-counter (getAcqStatus) edits and the same checks (plus the frame counter) as 2p-rig-nodes/tests/test_scanimage_node.py, 11/11 on the Bergamo PC. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
5 tasks done
mbreiser
marked this pull request as ready for review
October 29, 2026 01:12
Merged
5 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Draft. For package set 0.4.0. Retargeted to
mainon 2026-10-28, after #3 (release 0.3.0) merged asf6fdd67. The diff is this one commit (06607ef), which merges cleanly. It can merge tomainand be tagged 0.4.0 whenever convenient: rigs install tagged channels, nevermain, and webDisplayTools pins 0.3.0 explicitly, so no rig sees 0.4.0 until a webDisplayTools release re-pins it.Why
Michael decided on 2026-10-28 that the imaging (2P / ScanImage) work stays out of the public repositories. It now lives in the private rig repository,
reiserlab/scanimage-2026-bergamounder2p-rig-nodes/. That is a pixi workspace laid out like this repo, and it installs therig_nodespackage. The ScanImage JSON-server connector moves there. Its copy carries the--frame-counter(getAcqStatus) edits from webDisplayTools #261.The boundary Michael confirmed:
/<src>/cmd|reply|statuscontract,ConnectorReplyand the closedoutcomevocabulary.What changes
rig_nodes/scanimage_node.py,scanimage_cmd.py,sims/si_json_mock.pyrig-scanimage-node,rig-scanimage-cmd,rig-si-mock, and thescanimage-node,scanimage-cmd,si-mocktaskstests/test_device_nodes.py(judge_scanimage, the/scanimage/*subscriptions)CONTRACT.md:<src>, command vocabulary and status fields. §2 gains one sentence: device nodes kept outside this repo follow the same rules under their own<src>.SETUP.md: the ScanImage port 5555 is no longer listed. The Bergamo PC row and its per-host notes are replaced by one pointer to2p-rig-nodes/SETUP.mdin the private repo.README.md, the package__init__,sims/__init__: the listings no longer mention ScanImage.Consumers
webDisplayTools
rig/usesrig_nodes.scanimage_nodeandrig_nodes.sims.si_json_mockthroughrig.py --scanimage/--si-mockand its harness. The coupling rule: the webDisplayTools PR that re-pinsrig/to 0.4.0 must be the SAME PR that drops--scanimage/--si-mock(and the harness's ScanImage path). A workspace that pins a channel withoutscanimage_nodewhile still offering the flag is the one inconsistent state. Until then it stays on 0.3.0, which still has them.Tests
test_pure.pyandtest_device_nodes.pyon the three platforms.test_device_nodes.pystill parses, and its remaining groups (FicTrac, Kinefly, BIAS, recorder) are unchanged.2p-rig-nodes/tests/test_scanimage_node.py, 11/11 on the Bergamo PC, 2026-10-28.Note on history
The ScanImage node stays readable in this repo's history (v0.2.1, v0.3.0). The frames and SiPM ports that were briefly on
release/0.3.0(39ec007, removed again ine363853) do too. History was not rewritten, by choice.🤖 Generated with Claude Code