mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-02 20:22:15 +02:00
Sergey Dontsov
bab1cfb906
Lets a reprint reuse the AMS slot the slicer itself picked, instead of re-deriving one from the file's static type/color. When a Print Queue VP has "Save AMS mapping" on, the slicer's own live-resolved ams_mapping (from the project_file MQTT command) is persisted onto the archive as extra_data.slicer_ams_mapping. A later reprint can reuse it via a new "Mapping" button in the filament-mapping panel — one click snaps every slot to the saved pick, click again reverts to auto-match. Archive cards and queue rows get an "AMS mapping saved" badge so it's visible beforehand. add_to_queue also falls back to the saved mapping automatically when the caller sends no explicit ams_mapping (e.g. a plain reprint with no per-slot edits). The queue item's own ams_mapping (used for that dispatch) is still captured unconditionally whenever the slicer provides it — that part is a correctness fix, not gated behind the toggle. Only the archive persistence for future reprints is opt-in. Split out from the original combined PR per review: this half is genuinely opt-in and low-risk (#2684). The dispatch-time validation gate that keeps a stored mapping honest (#1308) changes behaviour for every existing user and will land as its own PR. Review fixes applied: - _extract_slicer_ams_mapping_json: dropped the unreachable `v is None` arm and rejected bool explicitly (isinstance(v, int) accepts bool). - Translated the Russian docstring text to English. - save_ams_mapping's model comment moved to a trailing comment on the column line, matching the file's convention. - usingArchiveMapping now resets when the plate or archive changes, so the Mapping button can't read ON against a mapping it never applied. - Translated "Click to change slot assignment" and "Re-read". - add_to_queue's fallback is now called out explicitly in code comments and covered by three new integration tests (fallback fires, explicit mapping wins, unrelated extra_data doesn't false-trigger). Closes #2684
79 lines
4.0 KiB
Python
79 lines
4.0 KiB
Python
from datetime import datetime
|
|
|
|
from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, func
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from backend.app.core.database import Base
|
|
|
|
# Canonical VP mode values. The legacy values `immediate` (→ archive) and
|
|
# `print_queue` (→ queue) shipped before the UI labels were aligned with the
|
|
# wire format. `normalize_vp_mode()` translates input from either form and
|
|
# the DB migration in `core/database.py` rewrites existing rows once at boot.
|
|
VP_MODE_ARCHIVE = "archive"
|
|
VP_MODE_REVIEW = "review"
|
|
VP_MODE_QUEUE = "queue"
|
|
VP_MODE_PROXY = "proxy"
|
|
VP_MODE_VALUES = (VP_MODE_ARCHIVE, VP_MODE_REVIEW, VP_MODE_QUEUE, VP_MODE_PROXY)
|
|
|
|
# Legacy → canonical map. Kept narrow on purpose so unrelated typos surface
|
|
# instead of getting silently re-pointed at a default.
|
|
_VP_MODE_ALIASES = {
|
|
"immediate": VP_MODE_ARCHIVE,
|
|
"print_queue": VP_MODE_QUEUE,
|
|
}
|
|
|
|
|
|
def normalize_vp_mode(value: str | None) -> str | None:
|
|
"""Map legacy wire values (`immediate`, `print_queue`) to canonical names.
|
|
|
|
Returns `None` unchanged so callers can decide whether to apply a default.
|
|
Returns unknown values unchanged so validators still see them and reject.
|
|
"""
|
|
if value is None:
|
|
return None
|
|
return _VP_MODE_ALIASES.get(value, value)
|
|
|
|
|
|
class VirtualPrinter(Base):
|
|
"""Virtual printer configuration for multi-instance support."""
|
|
|
|
__tablename__ = "virtual_printers"
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True)
|
|
name: Mapped[str] = mapped_column(String(100), default="Bambuddy")
|
|
enabled: Mapped[bool] = mapped_column(Boolean, default=False)
|
|
mode: Mapped[str] = mapped_column(String(20), default=VP_MODE_ARCHIVE) # archive|review|queue|proxy
|
|
auto_dispatch: Mapped[bool] = mapped_column(Boolean, server_default="true") # queue mode: auto-start or manual
|
|
queue_force_color_match: Mapped[bool] = mapped_column(
|
|
Boolean, server_default="false"
|
|
) # queue mode: pin per-slot type+color from the 3MF onto the queue
|
|
# item so the scheduler refuses to dispatch onto a printer with the wrong
|
|
# filament loaded (#1188).
|
|
save_ams_mapping: Mapped[bool] = mapped_column(
|
|
Boolean, server_default="false"
|
|
) # queue mode: persist the slicer's own live-resolved AMS-slot pick (the
|
|
# `ams_mapping` field on the MQTT `project_file` command) onto the
|
|
# archive's `extra_data.slicer_ams_mapping`, so a later reprint can reuse
|
|
# the exact physical spool instead of re-deriving one from the file's
|
|
# static type/color. Off by default — archives don't grow this field
|
|
# unless the user opts in per virtual printer.
|
|
gcode_injection: Mapped[bool] = mapped_column(
|
|
Boolean, server_default="false"
|
|
) # queue mode: opt this VP's Send/Print jobs into per-model G-code snippet
|
|
# injection (#1516). Default off so existing gcode_snippets users don't
|
|
# silently start injecting; no-op when no snippets exist for the model.
|
|
model: Mapped[str | None] = mapped_column(String(50), nullable=True) # SSDP model code (server mode)
|
|
access_code: Mapped[str | None] = mapped_column(String(8), nullable=True) # 8 chars (server mode)
|
|
target_printer_id: Mapped[int | None] = mapped_column(
|
|
Integer, ForeignKey("printers.id", ondelete="SET NULL"), nullable=True
|
|
) # proxy mode
|
|
bind_ip: Mapped[str | None] = mapped_column(String(45), nullable=True) # dedicated IP (proxy mode)
|
|
remote_interface_ip: Mapped[str | None] = mapped_column(String(45), nullable=True) # SSDP advertise IP
|
|
tailscale_disabled: Mapped[bool] = mapped_column(
|
|
Boolean, server_default="true"
|
|
) # opt-in: user must explicitly enable; auto-detect only runs then
|
|
serial_suffix: Mapped[str] = mapped_column(String(9), default="391800001") # unique per printer
|
|
position: Mapped[int] = mapped_column(Integer, default=0)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now(), onupdate=func.now())
|