mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-09-30 11:12:35 +02:00
maziggy
61c15aac03
UNIFIED PRESET LISTING (the main feature)
The initial slicer integration only saw DB-backed local imports — users
without imported profiles got an empty Slice modal even when their
Bambu Cloud account or the slicer sidecar carried perfectly usable
presets. The Slice modal now pulls from three tiers in priority order:
- cloud: user's own Bambu Cloud presets, fetched live.
- local: DB-backed imports.
- standard: slicer-bundled stock profiles via the sidecar's new
GET /profiles/bundled endpoint.
Listing endpoint: GET /api/v1/slicer/presets
- Name-based dedup, cloud > local > standard, within-tier order
preserved exactly. A preset that exists in multiple tiers only
renders in the highest-priority one.
- cloud_status (ok / not_authenticated / expired / unreachable)
drives a precise modal banner instead of an unexplained empty
list.
- Cloud branch: per-user cache, 5 min TTL, key
(user_id, sha256(token)[:16]) so logout/login or token rotation
auto-invalidates without callback wiring from the cloud-auth
routes.
- Bundled branch: global cache, 1 h TTL.
- Bundled URL respects preferred_slicer (bambu_studio vs orcaslicer)
so BambuStudio installs see the bambu sidecar's bundled list, not
OrcaSlicer's.
Slicing endpoint: POST /library/files/{id}/slice + /archives/{id}/slice
- Body now accepts source-aware {source, id} triplets per slot:
printer_preset: PresetRef
process_preset: PresetRef
filament_preset: PresetRef
- Legacy *_preset_id integer fields kept for backwards-compat. The
schema validator normalises bare ints into
PresetRef(source='local', id=str(int)) so the route handler only
deals with one shape.
New preset_resolver service fetches the JSON content per source:
- cloud: BambuCloudService.get_setting_detail(id), unwraps the
`setting` envelope (falls back to top-level for minor
shape variants).
- local: DB read with preset_type slot validation (existing path,
factored into the new helper).
- standard: minimal {name, inherits, from: "system"} stub — the
sidecar's profile-resolver flattens it against
BUNDLED_PROFILES_PATH/<category>/<name>.json with no
preset-content round-trip from Bambuddy.
PERMISSIONS
- Listing route gate: LIBRARY_UPLOAD (matches the slice action — any
user who can slice can populate the dropdowns).
- Cloud branch in BOTH the listing helper and the resolver checks
CLOUD_AUTH independently — a user with LIBRARY_UPLOAD but not
CLOUD_AUTH doesn't see the cloud tier (returns 403 if they try
to slice with a cloud preset) even if a leftover User.cloud_token
survived a permission revocation. Cloud listing path
short-circuits the token lookup entirely on the gate-fail branch.
FRONTEND — SliceModal
- Calls api.getSlicerPresets() instead of api.getLocalPresets().
- Dropdowns render <optgroup> per tier with localised section
labels (Cloud / Imported / Standard).
- Default selection follows cloud > local > standard priority on
first load (auto-pick fires once when the data arrives, manual
choices stick after that).
- Cloud-status banner renders three variants
(sign-in / expired / unreachable) only when status != 'ok'.
- Slice button submits source-aware refs; legacy integer payload
is preserved server-side for older clients.
3MF PROFILE-PATH HARDENING (shipped together because they touch the
same code paths)
(1) Strip widened. _strip_3mf_embedded_settings only removed
Metadata/project_settings.config. Real-world Bambu Studio /
OrcaSlicer 3MFs also carry model_settings.config, slice_info.config,
and cut_information.xml — any single leftover trips the CLI's
input validation and the slice falls back to embedded settings,
making the SliceModal's profile picker theatrical for 3MF inputs.
Now removes all four configs via a centralised
_STRIPPABLE_3MF_CONFIGS frozenset with per-file rationale;
geometry (3D/3dmodel.model), thumbnails, multi-part data
preserved.
(2) Sidecar 5xx error capture. slicer_api.py was reading only
`message` from sidecar 5xx responses and dropping `details`, so
every CLI failure surfaced as the unhelpful generic
"Failed to slice the model". New _format_sidecar_error helper
combines both fields, falls back to plain-text body for
non-JSON 5xx (nginx 502s, gateway timeouts), replaces the four
duplicated extraction blocks. Pairs with the orca-slicer-api
fork's bambuddy/profile-resolver branch which now emits
`details` on AppError responses (d9c6121) and captures CLI
stderr in the failure path (fb928c8).
CARE TAKEN — additive on existing surfaces
- main.py: +1 import, +1 router register
- slicer_api.py: +list_bundled_profiles, +_format_sidecar_error
(dedupes the 4 message-extraction blocks);
no existing method behaviour changed
- library.py: resolver swap inside _run_slicer_with_fallback,
user_id threaded through two callers,
strip widened
- schemas/slicer.py: PresetRef added, *_preset fields added,
legacy *_preset_id kept; validator normalises
- 4 new files: schema, route, resolver, tests
- No existing route URL changed, no existing field removed, no
behaviour change for clients still sending bare integer ids.
TESTS
- 17 unit tests for the listing endpoint helpers
- 11 unit tests for the source-aware resolver
- 6 schema tests for SliceRequest legacy + new shapes
- 3 unit tests for the new sidecar error-detail capture
- Strip integration test extended to assert all 4 configs go and
geometry stays
- 12 frontend tests for SliceModal covering tier-priority
auto-selection, <optgroup> grouping, fallback paths, source-aware
payload on submit, manual override across tiers, archive vs
library routing, error display, all three banner variants
Verified: 3394 backend + 1531 frontend tests pass, ruff clean,
frontend production build clean.
Pairs with three already-pushed commits on the orca-slicer-api fork's
bambuddy/profile-resolver branch:
- 5fd6bc6 feat(profiles): add GET /profiles/bundled
- d9c6121 fix(error): include causeMessage in JSON response as `details`
- fb928c8 fix(slicing): include CLI stdout/stderr in failure causeMessage
87 lines
3.5 KiB
Python
87 lines
3.5 KiB
Python
"""Tests for `SliceRequest` validator — covers both the legacy bare-int
|
|
shape and the new source-aware shape, plus the backwards-compat
|
|
normalisation that lets the route handler ignore the difference.
|
|
"""
|
|
|
|
import pytest
|
|
from pydantic import ValidationError
|
|
|
|
from backend.app.schemas.slicer import PresetRef, SliceRequest
|
|
|
|
|
|
class TestLegacyBareIntegerShape:
|
|
"""Existing clients (and stale browser tabs after upgrade) keep
|
|
sending bare integer ids. They must continue working unchanged."""
|
|
|
|
def test_bare_int_ids_normalise_to_local_preset_ref(self):
|
|
req = SliceRequest(printer_preset_id=1, process_preset_id=2, filament_preset_id=3)
|
|
assert req.printer_preset == PresetRef(source="local", id="1")
|
|
assert req.process_preset == PresetRef(source="local", id="2")
|
|
assert req.filament_preset == PresetRef(source="local", id="3")
|
|
|
|
def test_legacy_ids_unchanged_in_payload(self):
|
|
"""The legacy fields stay populated — no behaviour change for
|
|
clients that read them back from the model."""
|
|
req = SliceRequest(printer_preset_id=10, process_preset_id=20, filament_preset_id=30)
|
|
assert req.printer_preset_id == 10
|
|
assert req.process_preset_id == 20
|
|
assert req.filament_preset_id == 30
|
|
|
|
|
|
class TestNewSourceAwareShape:
|
|
"""The new modal sends source-aware refs explicitly."""
|
|
|
|
def test_cloud_refs_pass_through(self):
|
|
req = SliceRequest(
|
|
printer_preset=PresetRef(source="cloud", id="PFUprinter"),
|
|
process_preset=PresetRef(source="cloud", id="PFUprocess"),
|
|
filament_preset=PresetRef(source="cloud", id="PFUfilament"),
|
|
)
|
|
assert req.printer_preset.source == "cloud"
|
|
assert req.printer_preset.id == "PFUprinter"
|
|
|
|
def test_mixed_sources_per_slot(self):
|
|
"""A user may pick cloud for printer, local for process, standard
|
|
for filament — the modal is per-slot."""
|
|
req = SliceRequest(
|
|
printer_preset=PresetRef(source="cloud", id="PFU123"),
|
|
process_preset=PresetRef(source="local", id="42"),
|
|
filament_preset=PresetRef(source="standard", id="Bambu PLA Basic"),
|
|
)
|
|
assert req.printer_preset.source == "cloud"
|
|
assert req.process_preset.source == "local"
|
|
assert req.filament_preset.source == "standard"
|
|
|
|
|
|
class TestValidationErrors:
|
|
def test_missing_printer_slot_raises(self):
|
|
with pytest.raises(ValidationError) as exc:
|
|
SliceRequest(process_preset_id=2, filament_preset_id=3)
|
|
assert "printer" in str(exc.value)
|
|
|
|
def test_invalid_source_rejected(self):
|
|
with pytest.raises(ValidationError):
|
|
SliceRequest(
|
|
printer_preset={"source": "made_up", "id": "x"},
|
|
process_preset_id=2,
|
|
filament_preset_id=3,
|
|
)
|
|
|
|
|
|
class TestPriorityWhenBothSet:
|
|
"""If a client sends BOTH the legacy id AND the new ref for the same
|
|
slot (unlikely in practice, but ambiguous), the new ref wins. Tests
|
|
pin the resolution order so a future schema change can't silently
|
|
flip it."""
|
|
|
|
def test_explicit_ref_wins_over_legacy_id(self):
|
|
req = SliceRequest(
|
|
printer_preset_id=999, # would resolve to local:999
|
|
printer_preset=PresetRef(source="cloud", id="PFU"),
|
|
process_preset_id=2,
|
|
filament_preset_id=3,
|
|
)
|
|
# Validator only fills the ref when it's None — the explicit cloud
|
|
# ref stays untouched.
|
|
assert req.printer_preset == PresetRef(source="cloud", id="PFU")
|