mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-08 07:01:40 +02:00
Bundle import never delivered what it implied: BambuStudio's .bbscfg export
strips system processes/filaments, so importing a bundle left users without
process presets and slicing fell back to embedded settings on STL. Bundle
mode also hid the standard tier behind a constrained dropdown, the actual
trap reported here.
Removed end-to-end:
- backend: POST/GET/DELETE /slicer/bundles*, SliceRequest.bundle,
SliceBundleSpec, dispatch fork in library.py, bundle-context params on
the filament-requirements endpoints, bundle-fingerprint cache key in
slice_preview.py, SlicerApiService.{import,list,get,delete}_bundle and
slice_with_bundle, BundleSummary / BundleNotFoundError.
- frontend: BundlePicker + BundleStringDropdown, isBundleMode + every
branch, bundle state/queries/dispatch in SliceModal.tsx, SlicerBundle /
SliceBundleSpec types, three bundle API methods. buildCompatibilityIndex
loses its bundle path; presetCompatibility keeps compatible_printers
plus the @BBL fallback.
- SlicerBundlesPanel turns into a permanent static notice explaining the
removal, alternative import paths, and the new slice-time lookup order
(Imported > Orca Cloud > Bambu Cloud > Standard sidecar fallback).
- i18n: slicerBundlesRemoved.{title,description,alternatives,lookupOrder}
translated across all 11 locales; slice.bundle*, slicerBundles.* keys
removed.
Fixed (surfaced by removing bundle mode):
- _resolve_cloud and _resolve_orca_cloud now force type per slot and pin
from: "system" on the payload before json.dumps. Bambu Cloud ships
type as "printer"/"print" and routinely empty `from`; the BS CLI's
--load-settings parser rejects both with return -5 / "input preset
file invalid". Standard tier already did this; cloud paths now match.
167 lines
7.0 KiB
Python
167 lines
7.0 KiB
Python
"""Pydantic schemas for slice requests."""
|
|
|
|
from typing import Literal
|
|
|
|
from pydantic import BaseModel, Field, model_validator
|
|
|
|
|
|
class PresetRef(BaseModel):
|
|
"""A source-aware reference to a printer / process / filament preset.
|
|
|
|
The SliceModal pulls dropdown options from four tiers (orca_cloud /
|
|
cloud / local / standard). At submit time the client sends one of these
|
|
per slot so the backend knows where to fetch the preset content from at
|
|
slice time. ``cloud`` is Bambu Cloud (kept as the bare name for backward
|
|
compatibility with existing requests); ``orca_cloud`` is Orca Cloud.
|
|
"""
|
|
|
|
source: Literal["orca_cloud", "cloud", "local", "standard"]
|
|
id: str = Field(
|
|
...,
|
|
description=(
|
|
"Orca Cloud profile id, Bambu Cloud setting_id, local DB row id (stringified), or standard preset name."
|
|
),
|
|
)
|
|
|
|
|
|
class SliceRequest(BaseModel):
|
|
"""Body for `POST /library/files/{file_id}/slice`.
|
|
|
|
Two preset shapes are accepted per slot for backwards-compatibility:
|
|
|
|
- **Legacy** — bare integer ``*_preset_id`` fields point into the
|
|
``local_presets`` table. Existing clients (and stale browser tabs after
|
|
a Bambuddy upgrade) keep working unchanged.
|
|
- **Source-aware** — ``*_preset`` carries an explicit
|
|
``{source, id}``. Required for cloud / standard tiers; also accepted
|
|
(and equivalent) for local presets when the client is on the new modal.
|
|
|
|
Exactly one of each pair must be set; the validator normalises legacy
|
|
integer ids into a ``PresetRef(source='local', id=str(id))`` so the
|
|
downstream resolver only deals with one shape.
|
|
"""
|
|
|
|
# Legacy fields — kept optional so older clients continue to work.
|
|
printer_preset_id: int | None = Field(
|
|
default=None,
|
|
description="DEPRECATED: prefer printer_preset. LocalPreset id with preset_type='printer'.",
|
|
)
|
|
process_preset_id: int | None = Field(
|
|
default=None,
|
|
description="DEPRECATED: prefer process_preset. LocalPreset id with preset_type='process'.",
|
|
)
|
|
filament_preset_id: int | None = Field(
|
|
default=None,
|
|
description="DEPRECATED: prefer filament_preset. LocalPreset id with preset_type='filament'.",
|
|
)
|
|
|
|
# Source-aware fields — set by the new SliceModal.
|
|
printer_preset: PresetRef | None = None
|
|
process_preset: PresetRef | None = None
|
|
filament_preset: PresetRef | None = None
|
|
|
|
# Multi-color: one PresetRef per AMS slot the source plate uses. Order is
|
|
# significant — the slicer matches index-by-index against the plate's
|
|
# filament slots. Always preferred over the legacy singular field; the
|
|
# validator promotes a singular field into ``[singular]`` when the list
|
|
# is empty so older clients keep working.
|
|
filament_presets: list[PresetRef] = Field(default_factory=list)
|
|
|
|
plate: int | None = Field(
|
|
default=None,
|
|
ge=0,
|
|
description=(
|
|
"Plate number to slice. ``None`` defaults to plate 1 on the sidecar "
|
|
"(matches the pre-multi-plate behaviour). ``0`` is the sidecar's "
|
|
"'all plates' sentinel — produces a single multi-plate 3MF whose "
|
|
"``Metadata/plate_N.gcode`` entries cover every plate in the "
|
|
"source. ``>= 1`` slices that one plate."
|
|
),
|
|
)
|
|
export_3mf: bool = Field(
|
|
default=False,
|
|
description="If true, request a 3MF response with embedded G-code instead of raw G-code.",
|
|
)
|
|
bed_type: str | None = Field(
|
|
default=None,
|
|
max_length=64,
|
|
description=(
|
|
"Override the process preset's curr_bed_type for this slice. Canonical "
|
|
"BambuStudio / OrcaSlicer values: 'Cool Plate', 'Engineering Plate', "
|
|
"'High Temp Plate', 'Textured PEI Plate', 'Smooth PEI Plate', "
|
|
"'Cool Plate (SuperTack)', 'Supertack Plate'. None ⇒ inherit from the "
|
|
"process preset unchanged (#1337)."
|
|
),
|
|
)
|
|
|
|
@model_validator(mode="after")
|
|
def normalise_preset_refs(self) -> "SliceRequest":
|
|
"""Each slot must end up with a `PresetRef` set. Legacy integer ids
|
|
become `(source='local', id=str(int))` so the route handler only
|
|
deals with the canonical shape. For filament: a non-empty
|
|
``filament_presets`` list satisfies the requirement on its own; an
|
|
empty list falls back to the singular fields, which then promote
|
|
into a one-element list.
|
|
"""
|
|
for slot, ref_attr, legacy_attr in (
|
|
("printer", "printer_preset", "printer_preset_id"),
|
|
("process", "process_preset", "process_preset_id"),
|
|
):
|
|
ref = getattr(self, ref_attr)
|
|
legacy_id = getattr(self, legacy_attr)
|
|
if ref is None and legacy_id is None:
|
|
raise ValueError(
|
|
f"{slot} preset is required: provide '{ref_attr}' (preferred) or legacy '{legacy_attr}'"
|
|
)
|
|
if ref is None:
|
|
setattr(self, ref_attr, PresetRef(source="local", id=str(legacy_id)))
|
|
|
|
# Filament accepts THREE shapes, in priority order:
|
|
# 1. filament_presets — multi-color array (new clients)
|
|
# 2. filament_preset — source-aware singular (single-color new clients)
|
|
# 3. filament_preset_id — legacy bare integer (old clients)
|
|
# The first non-empty shape wins; missing all three raises.
|
|
if not self.filament_presets:
|
|
if self.filament_preset is not None:
|
|
self.filament_presets = [self.filament_preset]
|
|
elif self.filament_preset_id is not None:
|
|
fallback = PresetRef(source="local", id=str(self.filament_preset_id))
|
|
self.filament_preset = fallback
|
|
self.filament_presets = [fallback]
|
|
else:
|
|
raise ValueError(
|
|
"filament preset is required: provide 'filament_presets' (preferred), "
|
|
"'filament_preset', or legacy 'filament_preset_id'"
|
|
)
|
|
elif self.filament_preset is None:
|
|
# Multi-color caller: backfill the singular from the first slot
|
|
# so callers that still read the legacy field see a stable value.
|
|
self.filament_preset = self.filament_presets[0]
|
|
return self
|
|
|
|
|
|
class SliceResponse(BaseModel):
|
|
"""Response from `POST /library/files/{file_id}/slice`. The result lands
|
|
in the user's library as a new ``LibraryFile`` (in the same folder as
|
|
the source)."""
|
|
|
|
library_file_id: int
|
|
name: str
|
|
print_time_seconds: int
|
|
filament_used_g: float
|
|
filament_used_mm: float
|
|
used_embedded_settings: bool = False
|
|
|
|
|
|
class SliceArchiveResponse(BaseModel):
|
|
"""Response from `POST /archives/{archive_id}/slice`. The result lands
|
|
in the user's archives as a new ``PrintArchive`` row, inheriting
|
|
printer / project metadata from the source archive."""
|
|
|
|
archive_id: int
|
|
name: str
|
|
print_time_seconds: int
|
|
filament_used_g: float
|
|
filament_used_mm: float
|
|
used_embedded_settings: bool = False
|