bambuddy

public_git/bambuddy

Fork 0

mirror of https://github.com/maziggy/bambuddy.git synced 2026-09-30 19:21:33 +02:00

Commit Graph

Author	SHA1	Message	Date
maziggy	7e1105dcb6	feat(slicer): bundle dispatch path for library slice route When SliceRequest.bundle is set, the dispatch picks the per-category JSON triplet from a sidecar-stored .bbscfg by name instead of resolving cloud/local/standard PresetRefs. Mirrors the bundle-aware preview slice (committed earlier) so live slices match the same profile triplet the modal previewed against. Schema: - SliceBundleSpec: bundle_id + printer_name + process_name + filament_names (min-length-1 list, plate-slot order) - SliceRequest.bundle: optional, validator skips preset-required check when set so bundle-only requests validate Dispatch: - _run_slicer_with_fallback branches on request.bundle - Skips resolve_preset_ref, calls slice_with_bundle - 3MF + bundle CLI 5xx still falls back to embedded-settings slice (used_embedded_settings=True surfaces in the response) - Sidecar 404 (unknown bundle / preset name) maps to 400	2026-05-06 09:42:15 +02:00
maziggy	988c00554e	feat(slicer): multi-color slicing + per-plate filament discovery The slice modal previously rendered exactly one filament dropdown and silently truncated multi-color 3MFs to a single profile, producing wrong colours on every multi-filament print. End-to-end fix across sidecar, backend, and frontend. Sidecar (orca-slicer-api / bambuddy/profile-resolver, separate commit): - /slice accepts up to 16 repeated filamentProfile parts; slicing service materializes each and joins paths with `;` for --load-filaments. - /profiles/bundled emits filament_type and filament_colour per leaf so the bundled tier carries metadata into the modal. Bambuddy backend: - SliceRequest gains filament_presets: list[PresetRef]. Validator accepts three shapes (multi-color array, source-aware singular, legacy bare-int id) and lands them all on a populated array before the route handler runs — fully backwards-compatible. - SlicerApiService.slice_with_profiles takes filament_profile_jsons: list[str] and sends one filamentProfile multipart part per profile (in submission order) so the sidecar receives N profiles cleanly. - New service slice_preview runs the sidecar's slice_without_profiles against an unsliced project file's embedded settings, parses the result's slice_info.config, and returns the canonical per-plate filament list. Cached by (kind, source_id, plate_id, content_hash) with LRU eviction at 256 entries, per-key asyncio.Lock prevents thundering-herd; transient sidecar failures are NOT cached so they retry naturally; parse failures ARE cached (deterministic property of the input, no point re-running). - /filament-requirements endpoint chain: slice_info.config (existing, sliced files) → preview-slice (new, unsliced project files) → project_settings.config + painted-face heuristic with 5% noise threshold (sidecar-down fallback). - threemf_tools gains extract_project_filaments_from_3mf and extract_plate_extruder_set_from_3mf — the latter unions object top-level extruder, per-part overrides, and painted-face quadtree leaves (1-E nibbles in paint_color attrs of <triangle> elements inside per-object .model files). - Cloud preset listing no longer fetches per-preset detail (Bambu's rate limit at ~10/sec returns 429 on every request for users with 50+ presets). Unified-listing dedup pass instead backfills metadata cross-tier so a cloud entry that wins dedup over a same-named local entry inherits the local's filament_type / filament_colour. Frontend: - SliceModal multi-step: plate-picker first when the source is a multi-plate 3MF, then preset dropdowns. One filament dropdown per AMS slot the plate actually uses, each pre-picked by metadata match against user's local + standard presets via existing colorsAreSimilar / normalizeColorForCompare utils. - SliceModal-only tier priority is now local → cloud → standard (was cloud → local → standard). Other consumers of /slicer/presets keep the existing cloud-first order. - Submits filament_presets array; backfills the legacy singular filament_preset from the array's first entry for stale-tab compatibility. - i18n keys added across all 8 locales: slice.filamentSlot, slice.tier.{local,cloud,standard}, slice.cloud.{notAuthenticated, expired,unreachable}, slice.noPresetsForSlot, slice.allPresetsRequired (en + de fully translated; six others seeded with English copies pending native translation, matching the project's existing flow). Permissions: no new endpoint paths added. Preview-slice runs inside /filament-requirements (LIBRARY_READ / ARCHIVES_READ) and multi-filament dispatch runs inside POST /slice (LIBRARY_UPLOAD). No auth surface widened. Tests: 6 SliceRequest schema tests for multi-filament + legacy-new precedence; 9 unit tests for slice_preview cache behaviour (LRU eviction with lock cleanup, content-hash invalidation, concurrent thundering-herd guard, no-cache-poison on transient sidecar failure); 15 unit tests for the two new threemf_tools helpers (5 + 10 cases including the 60/40 painted-threshold regression pin); a multi-filament wire-format test pinning the multipart part count + order; 22 frontend SliceModal tests covering plate picker, multi-color render, metadata-aware pre-pick, manual override, and the new tier order.	2026-04-28 12:20:59 +02:00
maziggy	61c15aac03	feat(slicer): unified Cloud/local/standard presets + harden 3MF profile path 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	2026-04-27 19:15:31 +02:00

Author

SHA1

Message

Date

maziggy

7e1105dcb6

feat(slicer): bundle dispatch path for library slice route

When SliceRequest.bundle is set, the dispatch picks the per-category
  JSON triplet from a sidecar-stored .bbscfg by name instead of
  resolving cloud/local/standard PresetRefs. Mirrors the bundle-aware
  preview slice (committed earlier) so live slices match the same
  profile triplet the modal previewed against.

  Schema:
  - SliceBundleSpec: bundle_id + printer_name + process_name +
    filament_names (min-length-1 list, plate-slot order)
  - SliceRequest.bundle: optional, validator skips preset-required
    check when set so bundle-only requests validate

  Dispatch:
  - _run_slicer_with_fallback branches on request.bundle
  - Skips resolve_preset_ref, calls slice_with_bundle
  - 3MF + bundle CLI 5xx still falls back to embedded-settings slice
    (used_embedded_settings=True surfaces in the response)
  - Sidecar 404 (unknown bundle / preset name) maps to 400

2026-05-06 09:42:15 +02:00

maziggy

988c00554e

feat(slicer): multi-color slicing + per-plate filament discovery

The slice modal previously rendered exactly one filament dropdown and
  silently truncated multi-color 3MFs to a single profile, producing wrong
  colours on every multi-filament print. End-to-end fix across sidecar,
  backend, and frontend.

  Sidecar (orca-slicer-api / bambuddy/profile-resolver, separate commit):
    - /slice accepts up to 16 repeated filamentProfile parts; slicing
      service materializes each and joins paths with `;` for
      --load-filaments.
    - /profiles/bundled emits filament_type and filament_colour per leaf
      so the bundled tier carries metadata into the modal.

  Bambuddy backend:
    - SliceRequest gains filament_presets: list[PresetRef]. Validator
      accepts three shapes (multi-color array, source-aware singular,
      legacy bare-int id) and lands them all on a populated array before
      the route handler runs — fully backwards-compatible.
    - SlicerApiService.slice_with_profiles takes filament_profile_jsons:
      list[str] and sends one filamentProfile multipart part per profile
      (in submission order) so the sidecar receives N profiles cleanly.
    - New service slice_preview runs the sidecar's slice_without_profiles
      against an unsliced project file's embedded settings, parses the
      result's slice_info.config, and returns the canonical per-plate
      filament list. Cached by (kind, source_id, plate_id, content_hash)
      with LRU eviction at 256 entries, per-key asyncio.Lock prevents
      thundering-herd; transient sidecar failures are NOT cached so they
      retry naturally; parse failures ARE cached (deterministic property
      of the input, no point re-running).
    - /filament-requirements endpoint chain: slice_info.config (existing,
      sliced files) → preview-slice (new, unsliced project files) →
      project_settings.config + painted-face heuristic with 5% noise
      threshold (sidecar-down fallback).
    - threemf_tools gains extract_project_filaments_from_3mf and
      extract_plate_extruder_set_from_3mf — the latter unions object
      top-level extruder, per-part overrides, and painted-face quadtree
      leaves (1-E nibbles in paint_color attrs of <triangle> elements
      inside per-object .model files).
    - Cloud preset listing no longer fetches per-preset detail (Bambu's
      rate limit at ~10/sec returns 429 on every request for users with
      50+ presets). Unified-listing dedup pass instead backfills metadata
      cross-tier so a cloud entry that wins dedup over a same-named local
      entry inherits the local's filament_type / filament_colour.

  Frontend:
    - SliceModal multi-step: plate-picker first when the source is a
      multi-plate 3MF, then preset dropdowns. One filament dropdown per
      AMS slot the plate actually uses, each pre-picked by metadata
      match against user's local + standard presets via existing
      colorsAreSimilar / normalizeColorForCompare utils.
    - SliceModal-only tier priority is now local → cloud → standard
      (was cloud → local → standard). Other consumers of /slicer/presets
      keep the existing cloud-first order.
    - Submits filament_presets array; backfills the legacy singular
      filament_preset from the array's first entry for stale-tab
      compatibility.
    - i18n keys added across all 8 locales: slice.filamentSlot,
      slice.tier.{local,cloud,standard}, slice.cloud.{notAuthenticated,
      expired,unreachable}, slice.noPresetsForSlot,
      slice.allPresetsRequired (en + de fully translated; six others
      seeded with English copies pending native translation, matching
      the project's existing flow).

  Permissions: no new endpoint paths added. Preview-slice runs inside
  /filament-requirements (LIBRARY_READ / ARCHIVES_READ) and multi-filament
  dispatch runs inside POST /slice (LIBRARY_UPLOAD). No auth surface
  widened.

  Tests: 6 SliceRequest schema tests for multi-filament + legacy-new
  precedence; 9 unit tests for slice_preview cache behaviour (LRU
  eviction with lock cleanup, content-hash invalidation, concurrent
  thundering-herd guard, no-cache-poison on transient sidecar failure);
  15 unit tests for the two new threemf_tools helpers (5 + 10 cases
  including the 60/40 painted-threshold regression pin); a multi-filament
  wire-format test pinning the multipart part count + order; 22 frontend
  SliceModal tests covering plate picker, multi-color render,
  metadata-aware pre-pick, manual override, and the new tier order.

2026-04-28 12:20:59 +02:00

maziggy

61c15aac03

feat(slicer): unified Cloud/local/standard presets + harden 3MF profile path

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

2026-04-27 19:15:31 +02:00