Commit 640d137
RPL
Update to MADSci v0.8
Lifts the module from v0.5 (the previous release on main) through v0.6
to v0.8 in one go for the RAPID 446 grimm rebuild.
The v0.5 -> v0.6 work was carried in the working tree but never landed
upstream; layering v0.8 changes on top here brings everything together.
This branch is preferred over the existing `madsci_0_7` branch, which
had the API rename done but commented out the entire `startup_handler`
resource-creation block (deck / slots / mounts) -- a regression we
explicitly avoided.
v0.5 -> v0.6 (carried forward):
- Resource names now in v0.8 convention: {node_name}.deck,
{node_name}.deck.nest_{i}, {node_name}.{mount}_mount.
- `slot_count` -> `nest_count` in the deck container attributes.
- `add_to_database=True` dropped from sub-templates (parent's
`add_to_database=True` handles them).
- `STOPPED` value added to the RobotStatus enum.
- `rate_limit_requests: int = 500` config option added.
v0.6 -> v0.8 (this round):
- pyproject.toml + pdm.lock: pin madsci.{node_module,client,common}~=0.8.0;
bump requires-python to >=3.10.
- src/ot2_rest_node.py: rename self.node_definition.{node_name,node_id}
-> self.node_info.* (20 sites: 4 in startup_handler for protocols path
+ deck/slot/mount names, 8 in _create_ot2_templates for created_by=,
8 in execute() for log messages).
- Dockerfile rewritten on the v0.8 base:
- Pin to ghcr.io/ad-sdl/madsci:v0.8.0.
- `uv pip install --python ${MADSCI_VENV}/bin/python -e ./ot2_module`
so the editable install lands in the venv the runtime actually uses.
- **No `USER` directive** -- the base entrypoint runs userdel/useradd
as root to remap UID/GID to the host's, then drops to madsci itself.
A trailing `USER madsci` breaks the entrypoint with
"usermod: cannot lock /etc/passwd; try again later."
- No dialout groups baked in -- OT-2s and Flex are network-only.
Verified end-to-end on grimm with all three OT2-family nodes:
ot2_spongebob /status -> ready: true, /state ot2_status_code: idle
ot2_patrick /status -> ready: true, /state ot2_status_code: idle
otflex_sandy /status -> ready: true, /state ot2_status_code: failed
(Flex's hardware state, not a container-side problem)
45 deck/slot/mount resources auto-created in postgres with the v0.8
`{node_name}.deck.nest_N` naming. ULIDs preserved via registry for
all three nodes.1 parent 552ad11 commit 640d137
5 files changed
Lines changed: 158 additions & 42 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | 16 | | |
| 17 | + | |
| 18 | + | |
18 | 19 | | |
19 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
20 | 24 | | |
21 | 25 | | |
22 | 26 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
0 commit comments