mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-09-30 11:12:35 +02:00
maziggy
e61a454a0f
Reporter saw a 544 g spool jump to 1000 g after pressing the eraser.
"Spools and remaining weights are not changed" - the dialog promised
this; the implementation did the opposite. Root cause was an
architectural conflation: `weight_used` did double duty as the
resettable "consumed since tracking started" counter AND as the basis
for the displayed remaining (`label_weight - weight_used`), so zeroing
it correctly cleared the stat but unavoidably reset remaining to full.
Spoolman has separate `used_weight` and `remaining_weight` fields, so
the API call there was correct - but Bambuddy's frontend was also
computing remaining as `label_weight - weight_used` for Spoolman
spools (ignoring Spoolman's real `remaining_weight` field), so the
same visual bug bit there too. Inventory-mode parity required fixing
both halves in one drop.
Internal mode
- New `weight_used_baseline` column (Float DEFAULT 0) on `spool`.
- Reset stamps `baseline = weight_used` and leaves `weight_used` alone.
- Displayed consumed = `weight_used - baseline`; remaining =
`label_weight - weight_used` (unchanged).
- Subsequent prints continue to grow `weight_used`, so the resettable
counter naturally tracks post-reset delta and remaining keeps
decrementing across the reset.
Spoolman mode
- `_map_spoolman_spool` now reads Spoolman's `remaining_weight` field
and returns a synthetic `weight_used = label - remaining` so the
frontend's remaining calc matches Spoolman's real stored value;
`weight_used_baseline = synthetic - real_used_weight` so the consumed
counter (`weight_used - baseline`) matches Spoolman's `used_weight`.
- Fallback path (no `remaining_weight` set) preserves the old behavior.
- Related fix: `update_spool` (Spoolman PATCH) was deriving the default
`weight_used` from `used_weight`, so editing unrelated fields AFTER
a reset would patch Spoolman with `remaining_weight = label - 0 =
label`, trampling the real value. Now derives from
`remaining_weight` so non-weight edits preserve physical state.
Frontend
- `InventoryPage` `totalConsumed` aggregate switched to
`Math.max(0, weight_used - (weight_used_baseline ?? 0))`.
- `ForecastPanel` `computeDeltaRate`, `totalUsedG`, and the per-spool
"consumed" table cell got the same treatment so forecast and
inventory aggregates stay coherent across a reset.
- `?? 0` keeps pre-migration installs rendering correctly until
`init_db()` runs the idempotent ALTER TABLE.
Migration
- `ALTER TABLE spool ADD COLUMN weight_used_baseline REAL DEFAULT 0`
via `_safe_execute` - SQLite and Postgres both accept it; verified
end-to-end on Postgres 16.
81 lines
5.1 KiB
Python
81 lines
5.1 KiB
Python
from datetime import datetime
|
|
|
|
from sqlalchemy import Boolean, DateTime, Float, Integer, String, func
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from backend.app.core.database import Base
|
|
|
|
|
|
class Spool(Base):
|
|
"""Spool inventory item for tracking filament spools and their properties."""
|
|
|
|
__tablename__ = "spool"
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True)
|
|
material: Mapped[str] = mapped_column(String(50)) # PLA, PETG, ABS, etc.
|
|
subtype: Mapped[str | None] = mapped_column(String(50)) # Basic, Matte, Silk, etc.
|
|
color_name: Mapped[str | None] = mapped_column(String(100)) # "Jade White"
|
|
rgba: Mapped[str | None] = mapped_column(String(8)) # RRGGBBAA hex
|
|
# Multi-colour gradient stops for filaments with more than one colour
|
|
# (e.g. tri-colour, multi-colour). Stored as comma-separated 6- or 8-char
|
|
# hex tokens without `#`. Empty/NULL means solid (uses `rgba`). Up to 8
|
|
# stops; combination mode is driven by `subtype` (Gradient, Multicolor).
|
|
extra_colors: Mapped[str | None] = mapped_column(String(255))
|
|
# Visual effect overlay independent of subtype: sparkle, wood, marble,
|
|
# glow, matte. Purely a rendering hint — does not affect MQTT/firmware.
|
|
effect_type: Mapped[str | None] = mapped_column(String(20))
|
|
brand: Mapped[str | None] = mapped_column(String(100)) # "Polymaker"
|
|
label_weight: Mapped[int] = mapped_column(Integer, default=1000) # Advertised net weight (g)
|
|
core_weight: Mapped[int] = mapped_column(Integer, default=250) # Empty spool weight (g)
|
|
core_weight_catalog_id: Mapped[int | None] = mapped_column(
|
|
Integer
|
|
) # Reference to spool_catalog entry for core weight
|
|
weight_used: Mapped[float] = mapped_column(Float, default=0) # Consumed grams
|
|
# Anchor for the resettable "Total Consumed" stat. The displayed counter
|
|
# is `weight_used - weight_used_baseline`; the Inventory page's "Reset
|
|
# usage to 0" action stamps baseline = weight_used so the counter zeroes
|
|
# without disturbing remaining (= label_weight - weight_used). Matches
|
|
# Spoolman's split between used_weight and remaining_weight (#1390).
|
|
weight_used_baseline: Mapped[float] = mapped_column(Float, default=0)
|
|
weight_locked: Mapped[bool] = mapped_column(Boolean, default=False) # Lock weight from AMS auto-sync
|
|
last_scale_weight: Mapped[int | None] = mapped_column(Integer) # Last gross weight from scale (g)
|
|
last_weighed_at: Mapped[datetime | None] = mapped_column(DateTime) # When last weighed
|
|
slicer_filament: Mapped[str | None] = mapped_column(String(50)) # Preset ID (e.g. "GFL99")
|
|
slicer_filament_name: Mapped[str | None] = mapped_column(String(100)) # Preset name for slicer
|
|
nozzle_temp_min: Mapped[int | None] = mapped_column() # Override min temp
|
|
nozzle_temp_max: Mapped[int | None] = mapped_column() # Override max temp
|
|
note: Mapped[str | None] = mapped_column(String(500))
|
|
added_full: Mapped[bool | None] = mapped_column() # Whether spool was added as full (unused)
|
|
|
|
# User-defined category (e.g. "Production", "Prototype", "Client A") for
|
|
# filtering and per-group low-stock thresholds (#729). Free text — the
|
|
# form autocompletes from categories already present on other spools.
|
|
category: Mapped[str | None] = mapped_column(String(50))
|
|
# Per-spool override of the global inventory low-stock threshold (%).
|
|
# NULL falls back to the `low_stock_threshold` setting. Lets users mark
|
|
# production spools with a higher threshold (alert earlier) and prototype
|
|
# spools with a lower one without changing the global default.
|
|
low_stock_threshold_pct: Mapped[int | None] = mapped_column(Integer)
|
|
|
|
# Cost tracking
|
|
cost_per_kg: Mapped[float | None] = mapped_column(Float) # Cost per kilogram
|
|
|
|
storage_location: Mapped[str | None] = mapped_column(String(255)) # User-editable storage location
|
|
|
|
last_used: Mapped[datetime | None] = mapped_column(DateTime) # Last time this spool was used in a print
|
|
encode_time: Mapped[datetime | None] = mapped_column(DateTime) # When spool was encoded/written to tag
|
|
tag_uid: Mapped[str | None] = mapped_column(String(32)) # RFID tag UID (up to 32 hex chars)
|
|
tray_uuid: Mapped[str | None] = mapped_column(String(32)) # Bambu Lab spool UUID (32 hex chars)
|
|
data_origin: Mapped[str | None] = mapped_column(String(20)) # How data was populated: manual, rfid_auto, nfc_link
|
|
tag_type: Mapped[str | None] = mapped_column(String(20)) # Tag vendor: bambulab, generic, etc.
|
|
archived_at: Mapped[datetime | None] = mapped_column(DateTime) # NULL = active
|
|
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())
|
|
|
|
k_profiles: Mapped[list["SpoolKProfile"]] = relationship(back_populates="spool", cascade="all, delete-orphan")
|
|
assignments: Mapped[list["SpoolAssignment"]] = relationship(back_populates="spool", cascade="all, delete-orphan")
|
|
|
|
|
|
from backend.app.models.spool_assignment import SpoolAssignment # noqa: E402
|
|
from backend.app.models.spool_k_profile import SpoolKProfile # noqa: E402
|