mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-20 09:03:43 +02:00
maziggy
d459b6eabb
Four #1712 issues from the 2026-06-04 Orca Cloud integration: (1) Tier order put Orca Cloud above everything across SliceModal, auto-pick scoring, dropdown groups, the AMS slot picker, and the backend precedence. Bambu-Cloud-only users saw their profiles deprioritised behind an empty Orca tier. (2) Cross-tier dedup hid a same-named preset in all but the highest- priority tier. A user with both a local-imported and an Orca-synced "Bambu PLA Basic" couldn't see the Orca copy as a picker option. (3) CloudStatusBanner nagged signed-out users with a permanent "Sign in to Orca Cloud" line at the top of every slice -- even after explicit logout. Bambu Cloud had the symmetric problem. (4) ConfigureAmsSlotModal source badges were inconsistent: Orca rows showed only "Custom" (no source identity), Bambu Cloud built-in rows had no badge at all, and the orthogonal isUser-driven "Custom" badge collided with the source badge for cloud user presets. Order is local > orca_cloud > cloud > standard everywhere it lives (SliceModal SLICE_MODAL_TIER_ORDER + TIER_BONUS + dropdown tier list, ConfigureAmsSlotModal sourceOrder, and backend precedence). The order drives auto-pick + visual group rendering; it does NOT hide profiles. _dedupe_by_name replaced with _enrich_cloud_metadata: every tier returns its full list across all three slots (printer / process / filament). The function still backfills Bambu Cloud filament metadata from same-named local / orca_cloud / standard entries so cloud filaments score in pickFilamentForSlot. CloudStatusBanner silently no-ops on not_authenticated for both clouds; expired / unreachable still surface. The not_authenticated i18n keys stay in the locale files dormant. ConfigureAmsSlotModal: one source badge per row, one colour per source (green Local / purple Orca Cloud / bambu-blue Bambu Cloud / amber Built-in). The legacy isUser-driven "Custom" badge is gone; every row identifies its tier consistently.
83 lines
3.6 KiB
Python
83 lines
3.6 KiB
Python
"""Pydantic schemas for the unified slicer-presets endpoint.
|
|
|
|
The SliceModal pulls printer/process/filament options from three sources, in
|
|
priority order: cloud (the user's Bambu Cloud account), local (DB-backed
|
|
imported profiles), and standard (slicer-bundled stock profiles). The endpoint
|
|
returns all three lists with name-based dedup applied so each preset appears
|
|
exactly once across the response.
|
|
"""
|
|
|
|
from typing import Literal
|
|
|
|
from pydantic import BaseModel
|
|
|
|
CloudStatus = Literal["ok", "not_authenticated", "expired", "unreachable"]
|
|
|
|
|
|
class UnifiedPreset(BaseModel):
|
|
"""A single printer/process/filament preset with its source.
|
|
|
|
The ``id`` shape varies by source:
|
|
- cloud → Bambu Cloud setting_id (e.g. ``"PFUS9ac902733670a9"``)
|
|
- local → stringified DB row id from ``local_presets``
|
|
- standard → preset name as written in the bundled JSON (the slicer
|
|
resolves bundled profiles by name during inheritance walk)
|
|
|
|
The frontend treats ``id`` as opaque; the slice dispatch path uses
|
|
``(source, id)`` to fetch / pass the preset content to the sidecar.
|
|
|
|
``filament_type`` and ``filament_colour`` are populated for the filament
|
|
slot only — they let the SliceModal pre-pick a preset per plate slot in
|
|
the multi-color flow by matching against the source 3MF's per-slot type
|
|
and color. Populated when the underlying preset JSON exposes them; left
|
|
as ``None`` on bundled profiles where colour is a runtime spool attribute.
|
|
|
|
``compatible_printers`` is the slicer's own list of printer-preset names a
|
|
process / filament preset declares itself valid for. Populated for the
|
|
local tier (stored at import time); left ``None`` for cloud (no per-preset
|
|
detail is fetched — rate limits) and standard (the sidecar's bundled
|
|
listing doesn't expose it). The SliceModal uses it to filter the
|
|
process / filament dropdowns by the selected printer (#1325); when it is
|
|
``None`` the modal falls back to the user's uploaded Slicer Bundles, which
|
|
map each printer to the presets it ships.
|
|
"""
|
|
|
|
id: str
|
|
name: str
|
|
source: Literal["orca_cloud", "cloud", "local", "standard"]
|
|
filament_type: str | None = None
|
|
filament_colour: str | None = None
|
|
compatible_printers: list[str] | None = None
|
|
|
|
|
|
class UnifiedPresetsBySlot(BaseModel):
|
|
"""Three slots in the order Bambu Studio / OrcaSlicer use."""
|
|
|
|
printer: list[UnifiedPreset] = []
|
|
process: list[UnifiedPreset] = []
|
|
filament: list[UnifiedPreset] = []
|
|
|
|
|
|
class UnifiedPresetsResponse(BaseModel):
|
|
"""Every tier carries its full preset list — no cross-tier dedup.
|
|
|
|
Priority order: ``local > orca_cloud > cloud > standard``. The order
|
|
drives auto-pick (first non-empty tier wins, name-lookup walks tiers
|
|
in this order, filament scoring tiebreaks by per-tier bonus) and
|
|
determines the visual rendering order of the SliceModal's optgroups,
|
|
but a name that exists in multiple tiers appears in EACH of their
|
|
groups so the user can pick any source.
|
|
|
|
``cloud_status`` / ``orca_cloud_status`` let the frontend show a banner
|
|
explaining why a cloud tier is empty when the user expected to see it
|
|
(signed out / token expired / network down). Each tier has its own
|
|
status because they can fail independently.
|
|
"""
|
|
|
|
orca_cloud: UnifiedPresetsBySlot = UnifiedPresetsBySlot()
|
|
cloud: UnifiedPresetsBySlot = UnifiedPresetsBySlot()
|
|
local: UnifiedPresetsBySlot = UnifiedPresetsBySlot()
|
|
standard: UnifiedPresetsBySlot = UnifiedPresetsBySlot()
|
|
cloud_status: CloudStatus = "ok"
|
|
orca_cloud_status: CloudStatus = "ok"
|