Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/scripts/cutlery_from_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@
base.PACKS = (PLANT,)
#: The files that are the pack. The rest of `labs/cutlery` is the lab's
#: tooling and a pack carries no code (decision 0022).
PACK_FILES = ("plant.toml", "line.json", "floor.json", "tag_map.json")
#: line_layout.json and models/ joined on 2026-11-14: where each machine stands
#: on the 3D line view, and its model. positions/ and make_layout.py generate
#: the layout and stay in the checkout.
PACK_FILES = ("plant.toml", "line.json", "floor.json", "tag_map.json", "line_layout.json")
PACK_DIRS = ("masterdata", "models")
MACHINES = 83

say, fail, ask, tell, until = base.say, base.fail, base.ask, base.tell, base.until
Expand All @@ -64,7 +68,8 @@ def the_copies_are_copies(repo: Path, wheel: Path) -> None:
zf.extractall(tmp)
ours = Path(tmp) / base.SHIPPED / PLANT
wanted = sorted([*PACK_FILES, *(p.relative_to(theirs).as_posix()
for p in (theirs / "masterdata").rglob("*") if p.is_file())])
for d in PACK_DIRS
for p in (theirs / d).rglob("*") if p.is_file())])
got = sorted(p.relative_to(ours).as_posix() for p in ours.rglob("*") if p.is_file())
if wanted != got:
fail(f"{PLANT}: the wheel's copy is not the lab's. In labs/{PLANT} but not the "
Expand Down
3 changes: 3 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ COPY labs/cutlery/plant.toml \
labs/cutlery/line.json \
labs/cutlery/floor.json \
labs/cutlery/tag_map.json \
labs/cutlery/line_layout.json \
./labs/cutlery/
COPY labs/cutlery/masterdata ./labs/cutlery/masterdata
# The 3D line view's machine models (2026-11-14), named by line_layout.json.
COPY labs/cutlery/models ./labs/cutlery/models

# THE ASSISTANT FOLDERS, FOR THE SAME REASON. `pyproject.toml` force-includes
# every file under `skills/` so that `fsmes skills unpack` works inside the
Expand Down
4 changes: 3 additions & 1 deletion labs/cutlery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ runs as a user service on port 5433; a scored run makes its own database

- `build_config.py` writes `line.json` (83 stations, the inspection block
per station: attributes, limits, sigma); `make_tag_map.py` derives
`tag_map.json`; `fsmes sim-generate` (or the runner) writes the CSVs
`tag_map.json`; `make_layout.py` derives `line_layout.json` (where each
machine stands on the 3D line view, and its model in `models/`) from
`positions/<LINE>.json`, studio's plant design of 2026-11-12; `fsmes sim-generate` (or the runner) writes the CSVs
under `out/`.
- `init.py` seeds the master data, the dimensional specifications per
utensil, and one released order per line with its resin or plate lot
Expand Down
Loading
Loading