Redesign SpoolBuddy dashboard: inline spool cards, full-screen AMS assign modal, filament ID normalization

- Replace TagDetectedModal with inline SpoolInfoCard/UnknownTagCard in dashboard right panel (known spools show assign/sync/close, unknown tags show add-to-inventory/link/close) - Rewrite AssignToAmsModal as full-screen overlay reusing AmsUnitCard, with AMS-HT and external slot support, single assignSpool API call - Remove printer selector from assign modal (uses top bar selection) - Extract filament_id <-> setting_id conversion to shared utility (backend/app/utils/filament_ids.py), used by inventory + cloud routes - Normalize slicer_filament in assign_spool to derive proper tray_info_idx and setting_id for MQTT (was sending setting_id="") - Rename SpoolBuddy top bar status label "Online" -> "Backend" - Remove weightStable guard from sync weight button
2026-10-21 10:15:04 +02:00 · 2026-03-01 11:56:52 +01:00
parent 8d9894793a
commit 1cf40a5c35
12 changed files with 794 additions and 712 deletions
@@ -0,0 +1,78 @@
+"""Utility functions for converting between filament_id and setting_id formats.
+
+Bambu printers use two ID formats for filament presets:
+  - **filament_id** (aka tray_info_idx): e.g. "GFL05", "GFG02", "GFA00"
+    Reported by printer firmware (RFID tags, AMS status).
+  - **setting_id**: e.g. "GFSL05", "GFSG02", "GFSA00"
+    Used by BambuStudio / Bambu Cloud API to resolve presets.
+
+The only difference for official Bambu filaments is an "S" inserted after "GF".
+User presets (starting with "P") use the same ID in both contexts.
+"""
+
+
+def filament_id_to_setting_id(filament_id: str) -> str:
+    """Convert filament_id → setting_id (e.g. "GFL05" → "GFSL05").
+
+    - Already a setting_id ("GFS…") → returned unchanged.
+    - User presets ("P…") → returned unchanged.
+    - Empty / unknown → returned unchanged.
+    """
+    if not filament_id:
+        return filament_id
+
+    # User presets start with "P" - leave unchanged
+    if filament_id.startswith("P"):
+        return filament_id
+
+    # Official Bambu presets: GFx## -> GFSx##
+    if filament_id.startswith("GF") and len(filament_id) >= 4:
+        # Already a setting_id (has S after GF)
+        if filament_id[2] == "S":
+            return filament_id
+        return f"GFS{filament_id[2:]}"
+
+    return filament_id
+
+
+def setting_id_to_filament_id(setting_id: str) -> str:
+    """Convert setting_id → filament_id (e.g. "GFSL05" → "GFL05").
+
+    - Already a filament_id ("GF" without "S") → returned unchanged.
+    - User presets ("P…") → returned unchanged.
+    - Empty / unknown → returned unchanged.
+    """
+    if not setting_id:
+        return setting_id
+
+    # User presets start with "P" - leave unchanged
+    if setting_id.startswith("P"):
+        return setting_id
+
+    # Setting_id format: GFSx## -> GFx##  (remove the "S")
+    if setting_id.startswith("GFS") and len(setting_id) >= 5:
+        return f"GF{setting_id[3:]}"
+
+    return setting_id
+
+
+def normalize_slicer_filament(slicer_filament: str | None) -> tuple[str, str]:
+    """Normalize a slicer_filament value into (tray_info_idx, setting_id).
+
+    The slicer_filament field on a spool can be stored in either format:
+      - filament_id: "GFL05"  (from RFID tag scan)
+      - setting_id:  "GFSL05" or "GFSL05_07"  (from cloud preset picker)
+
+    Returns (tray_info_idx, setting_id) with version suffixes stripped.
+    """
+    raw = slicer_filament or ""
+    if not raw:
+        return ("", "")
+
+    # Strip version suffix (e.g. "GFSL05_07" → "GFSL05")
+    base = raw.split("_")[0] if "_" in raw else raw
+
+    tray_info_idx = setting_id_to_filament_id(base)
+    sid = filament_id_to_setting_id(base)
+
+    return (tray_info_idx, sid)