mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-22 03:49:18 +02:00
maziggy
856b849ffa
Statistics now aggregate over PrintLogEntry (one row per print event,
the same table backing the global Print Log) rather than PrintArchive
(one row per file). A reprint creates a new PrintLogEntry instead of
overwriting the source archive's runtime fields, so:
- a 100 g successful print + a 10 g failed reprint correctly sums to
110 g / 2 prints / 1 successful / 1 failed in Quick Stats and the
Prometheus /metrics endpoint (previously the failed reprint silently
replaced the source archive's data; totals dropped from 100 g to 10 g)
- the archive's card cost/energy_kwh are preserved on reprints (only
the first run writes them); per-run actuals live on PrintLogEntry
- failed/cancelled/stopped reprints record partial-aware filament: sum
of tracked spool deltas when inventory is set up, else estimate
scaled to progress%, else None — prevents the full slicer estimate
from inflating totals on a print that stopped at 10 % progress
PrintLogEntry gains six columns: archive_id (nullable FK, ON DELETE
SET NULL so log entries survive archive deletion preserving #1343
soft-delete-vs-stats decoupling), cost, energy_kwh, energy_cost,
failure_reason, created_by_id. Idempotent SQLite + Postgres migrations.
New per-archive surface:
- archive list response carries run_count / last_run_at /
total_filament_actual_grams / successful_run_count / failed_run_count
via a single batch JOIN, no N+1
- new GET /archives/{id}/runs endpoint returns every PrintLogEntry for
the archive (ARCHIVES_READ permission, newest-first ordering)
- archive cards render an orange "N prints" badge for archives with
more than one run; clicking the badge opens a dedicated PrintLogModal
with date/status/duration/filament/cost columns plus failure_reason
under failed runs. Also reachable via the context menu's new "Print
Log" entry (works for single-run archives too), and embedded at the
top of the Edit Archive modal for context.
The purge_stats=true delete path now hard-deletes linked PrintLogEntry
rows up front so the archive's contribution truly leaves the totals;
without it, ON DELETE SET NULL would orphan the runs and leave them
counting toward stats.
70 lines
3.6 KiB
Python
70 lines
3.6 KiB
Python
"""Unit tests for the per-run filament helper (#1378).
|
||
|
||
The helper computes what value to write into PrintLogEntry.filament_used_grams
|
||
for a given print event — partial-aware so failed / cancelled / stopped prints
|
||
don't inflate stats with the full slicer estimate.
|
||
"""
|
||
|
||
from backend.app.main import _compute_run_filament_grams
|
||
|
||
|
||
class TestComputeRunFilamentGrams:
|
||
def test_completed_returns_archive_estimate(self):
|
||
# Completed print: the slicer estimate is approximately what was used.
|
||
assert _compute_run_filament_grams("completed", 100.0, 100, []) == 100.0
|
||
|
||
def test_completed_returns_estimate_even_when_tracked_differs(self):
|
||
# When a print completes, the estimate is the canonical "this print used X"
|
||
# value — the tracked spool delta might be lower (some slots untracked)
|
||
# but the print is done, so the full estimate is the right answer.
|
||
assert _compute_run_filament_grams("completed", 100.0, 100, [{"weight_used": 10}]) == 100.0
|
||
|
||
def test_failed_uses_tracked_spool_delta(self):
|
||
# Failed reprint at 10g actual: inventory tracked the spool delta.
|
||
# The estimate was 100g; we want 10g recorded for stats.
|
||
assert _compute_run_filament_grams("failed", 100.0, 10, [{"weight_used": 10.0}]) == 10.0
|
||
|
||
def test_cancelled_uses_tracked_spool_delta(self):
|
||
# Same logic for cancelled.
|
||
assert _compute_run_filament_grams("cancelled", 100.0, 12, [{"weight_used": 8.5}]) == 8.5
|
||
|
||
def test_stopped_uses_tracked_spool_delta(self):
|
||
assert _compute_run_filament_grams("stopped", 100.0, 15, [{"weight_used": 12.0}]) == 12.0
|
||
|
||
def test_failed_with_no_tracked_falls_back_to_progress_scale(self):
|
||
# No inventory tracking: scale estimate by progress% (10% of 100g = 10g).
|
||
assert _compute_run_filament_grams("failed", 100.0, 10, []) == 10.0
|
||
|
||
def test_failed_with_no_tracked_and_no_progress_returns_none(self):
|
||
# Nothing to infer from — return None rather than guess the estimate.
|
||
assert _compute_run_filament_grams("failed", 100.0, 0, []) is None
|
||
|
||
def test_failed_with_partial_progress_rounds_correctly(self):
|
||
# 100g × 33% = 33.0g (rounded to 1 decimal)
|
||
assert _compute_run_filament_grams("failed", 100.0, 33, []) == 33.0
|
||
|
||
def test_failed_with_no_estimate_returns_none(self):
|
||
# No estimate, no tracked usage → can't compute anything.
|
||
assert _compute_run_filament_grams("failed", None, 50, []) is None
|
||
|
||
def test_failed_with_no_estimate_but_tracked_uses_tracked(self):
|
||
# Tracked spool delta is authoritative even without an estimate.
|
||
assert _compute_run_filament_grams("failed", None, 50, [{"weight_used": 5.0}]) == 5.0
|
||
|
||
def test_tracked_overrides_progress_scale_when_both_available(self):
|
||
# If inventory says 8g but progress says 15g, trust inventory (it's measured).
|
||
assert _compute_run_filament_grams("failed", 100.0, 15, [{"weight_used": 8.0}]) == 8.0
|
||
|
||
def test_progress_above_100_clamps_to_full_estimate(self):
|
||
# Defensive: progress overshoot doesn't multiply past the estimate.
|
||
assert _compute_run_filament_grams("failed", 100.0, 150, []) == 100.0
|
||
|
||
def test_multiple_tracked_slots_summed(self):
|
||
# Multi-filament print, two slots tracked.
|
||
usage = [{"weight_used": 5.0}, {"weight_used": 3.5}, {"weight_used": 1.0}]
|
||
assert _compute_run_filament_grams("failed", 100.0, 20, usage) == 9.5
|
||
|
||
def test_completed_with_none_estimate_returns_none(self):
|
||
# Archive somehow has no estimate (rare; archive_print parsed nothing).
|
||
assert _compute_run_filament_grams("completed", None, 100, []) is None
|