tonym
9bfc322f32
Some checks failed
CI / style (push) Has been cancelled
CI / build-client (push) Has been cancelled
CI / build-amd64 (push) Has been cancelled
CI / build-tester (push) Has been cancelled
CI / test (cockroachdb) (push) Has been cancelled
CI / test (mariadb) (push) Has been cancelled
CI / test (postgres) (push) Has been cancelled
CI / test (sqlite) (push) Has been cancelled
CI / build-arm64 (push) Has been cancelled
CI / build-armv7 (push) Has been cancelled
CI / publish-images (push) Has been cancelled
CI / publish-release (push) Has been cancelled
Add optional color column to spool list showing filament color swatches with multi-select filtering capability. Backend: - GET /api/v1/color endpoint to list distinct filament colors - filament.color_hex query param on spool list for filtering Frontend: - ColorFilterColumn component renders color swatches - useSpoolmanColors() hook fetches available colors - Filter dropdown shows swatches with hex codes - Column hidden by default (enable via column selector) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
629 lines
21 KiB
Python
629 lines
21 KiB
Python
"""Spool related endpoints."""
|
|
|
|
import asyncio
|
|
import logging
|
|
from datetime import datetime
|
|
from typing import Annotated, Optional
|
|
|
|
from fastapi import APIRouter, Depends, Query, WebSocket, WebSocketDisconnect
|
|
from fastapi.encoders import jsonable_encoder
|
|
from fastapi.responses import JSONResponse
|
|
from pydantic import BaseModel, Field, field_validator
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from spoolman.api.v1.models import Message, Spool, SpoolAdjustment, SpoolEvent
|
|
from spoolman.database import spool
|
|
from spoolman.database.database import get_db_session
|
|
from spoolman.database.utils import SortOrder
|
|
from spoolman.exceptions import ItemCreateError, SpoolMeasureError
|
|
from spoolman.extra_fields import EntityType, get_extra_fields, validate_extra_field_dict
|
|
from spoolman.ws import websocket_manager
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter(
|
|
prefix="/spool",
|
|
tags=["spool"],
|
|
)
|
|
|
|
# ruff: noqa: D103,B008
|
|
|
|
|
|
class SpoolParameters(BaseModel):
|
|
first_used: Optional[datetime] = Field(None, description="First logged occurence of spool usage.")
|
|
last_used: Optional[datetime] = Field(None, description="Last logged occurence of spool usage.")
|
|
filament_id: int = Field(description="The ID of the filament type of this spool.")
|
|
price: Optional[float] = Field(
|
|
None,
|
|
ge=0,
|
|
description="The price of this filament in the system configured currency.",
|
|
examples=[20.0],
|
|
)
|
|
initial_weight: Optional[float] = Field(
|
|
None,
|
|
ge=0,
|
|
description="The initial weight of the filament on the spool, in grams. (net weight)",
|
|
examples=[200],
|
|
)
|
|
spool_weight: Optional[float] = Field(
|
|
None,
|
|
ge=0,
|
|
description="The weight of an empty spool, in grams. (tare weight)",
|
|
examples=[200],
|
|
)
|
|
remaining_weight: Optional[float] = Field(
|
|
None,
|
|
ge=0,
|
|
description=(
|
|
"Remaining weight of filament on the spool. Can only be used if the filament type has a weight set."
|
|
),
|
|
examples=[800],
|
|
)
|
|
used_weight: Optional[float] = Field(
|
|
None,
|
|
ge=0,
|
|
description="Used weight of filament on the spool.",
|
|
examples=[200],
|
|
)
|
|
location: Optional[str] = Field(
|
|
None,
|
|
max_length=64,
|
|
description="Where this spool can be found.",
|
|
examples=["Shelf A"],
|
|
)
|
|
lot_nr: Optional[str] = Field(
|
|
None,
|
|
max_length=64,
|
|
description="Vendor manufacturing lot/batch number of the spool.",
|
|
examples=["52342"],
|
|
)
|
|
comment: Optional[str] = Field(
|
|
None,
|
|
max_length=1024,
|
|
description="Free text comment about this specific spool.",
|
|
examples=[""],
|
|
)
|
|
archived: bool = Field(default=False, description="Whether this spool is archived and should not be used anymore.")
|
|
needs_weighing: bool = Field(default=False, description="Whether this spool needs manual weigh-in.")
|
|
extra: Optional[dict[str, str]] = Field(
|
|
None,
|
|
description="Extra fields for this spool.",
|
|
)
|
|
|
|
|
|
class SpoolUpdateParameters(SpoolParameters):
|
|
filament_id: Optional[int] = Field(None, description="The ID of the filament type of this spool.")
|
|
|
|
@field_validator("filament_id")
|
|
@classmethod
|
|
def prevent_none(cls: type["SpoolUpdateParameters"], v: Optional[int]) -> Optional[int]:
|
|
"""Prevent filament_id from being None."""
|
|
if v is None:
|
|
raise ValueError("Value must not be None.")
|
|
return v
|
|
|
|
|
|
class SpoolUseParameters(BaseModel):
|
|
use_length: Optional[float] = Field(None, description="Length of filament to reduce by, in mm.", examples=[2.2])
|
|
use_weight: Optional[float] = Field(None, description="Filament weight to reduce by, in g.", examples=[5.3])
|
|
comment: Optional[str] = Field(
|
|
None,
|
|
max_length=256,
|
|
description="Optional comment about this adjustment (e.g., 'printed cover piece').",
|
|
examples=["Test print"],
|
|
)
|
|
|
|
|
|
class SpoolMeasureParameters(BaseModel):
|
|
weight: float = Field(description="Current gross weight of the spool, in g.", examples=[200])
|
|
comment: Optional[str] = Field(
|
|
None,
|
|
max_length=256,
|
|
description="Optional comment about this adjustment (e.g., 'weighed after print').",
|
|
examples=["After printing benchy"],
|
|
)
|
|
|
|
|
|
@router.get(
|
|
"",
|
|
name="Find spool",
|
|
description=(
|
|
"Get a list of spools that matches the search query. "
|
|
"A websocket is served on the same path to listen for updates to any spool, or added or deleted spools. "
|
|
"See the HTTP Response code 299 for the content of the websocket messages."
|
|
),
|
|
response_model_exclude_none=True,
|
|
responses={
|
|
200: {"model": list[Spool]},
|
|
299: {"model": SpoolEvent, "description": "Websocket message"},
|
|
},
|
|
)
|
|
async def find(
|
|
*,
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
filament_name_old: Annotated[
|
|
Optional[str],
|
|
Query(alias="filament_name", title="Filament Name", description="See filament.name.", deprecated=True),
|
|
] = None,
|
|
filament_id_old: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament_id",
|
|
title="Filament ID",
|
|
description="See filament.id.",
|
|
deprecated=True,
|
|
pattern=r"^-?\d+(,-?\d+)*$",
|
|
),
|
|
] = None,
|
|
filament_material_old: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament_material",
|
|
title="Filament Material",
|
|
description="See filament.material.",
|
|
deprecated=True,
|
|
),
|
|
] = None,
|
|
vendor_name_old: Annotated[
|
|
Optional[str],
|
|
Query(alias="vendor_name", title="Vendor Name", description="See filament.vendor.name.", deprecated=True),
|
|
] = None,
|
|
vendor_id_old: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="vendor_id",
|
|
title="Vendor ID",
|
|
description="See filament.vendor.id.",
|
|
deprecated=True,
|
|
pattern=r"^-?\d+(,-?\d+)*$",
|
|
),
|
|
] = None,
|
|
filament_name: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.name",
|
|
title="Filament Name",
|
|
description=(
|
|
"Partial case-insensitive search term for the filament name. Separate multiple terms with a comma. "
|
|
"Specify an empty string to match spools with no filament name. "
|
|
"Surround a term with quotes to search for the exact term."
|
|
),
|
|
),
|
|
] = None,
|
|
filament_id: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.id",
|
|
title="Filament ID",
|
|
description="Match an exact filament ID. Separate multiple IDs with a comma.",
|
|
examples=["1", "1,2"],
|
|
pattern=r"^-?\d+(,-?\d+)*$",
|
|
),
|
|
] = None,
|
|
filament_material: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.material",
|
|
title="Filament Material",
|
|
description=(
|
|
"Partial case-insensitive search term for the filament material. Separate multiple terms with a comma. "
|
|
"Specify an empty string to match spools with no filament material. "
|
|
"Surround a term with quotes to search for the exact term."
|
|
),
|
|
),
|
|
] = None,
|
|
filament_color_hex: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.color_hex",
|
|
title="Filament Color",
|
|
description=(
|
|
"Filter by exact filament color hex code (without #). Separate multiple colors with a comma."
|
|
),
|
|
examples=["FF0000", "FF0000,00FF00,0000FF"],
|
|
),
|
|
] = None,
|
|
filament_vendor_name: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.vendor.name",
|
|
title="Vendor Name",
|
|
description=(
|
|
"Partial case-insensitive search term for the filament vendor name. "
|
|
"Separate multiple terms with a comma. "
|
|
"Specify an empty string to match spools with no vendor name. "
|
|
"Surround a term with quotes to search for the exact term."
|
|
),
|
|
),
|
|
] = None,
|
|
filament_vendor_id: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
alias="filament.vendor.id",
|
|
title="Vendor ID",
|
|
description=(
|
|
"Match an exact vendor ID. Separate multiple IDs with a comma. "
|
|
"Set it to -1 to match spools with filaments with no vendor."
|
|
),
|
|
examples=["1", "1,2"],
|
|
pattern=r"^-?\d+(,-?\d+)*$",
|
|
),
|
|
] = None,
|
|
location: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
title="Location",
|
|
description=(
|
|
"Partial case-insensitive search term for the spool location. Separate multiple terms with a comma. "
|
|
"Specify an empty string to match spools with no location. "
|
|
"Surround a term with quotes to search for the exact term."
|
|
),
|
|
),
|
|
] = None,
|
|
lot_nr: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
title="Lot/Batch Number",
|
|
description=(
|
|
"Partial case-insensitive search term for the spool lot number. Separate multiple terms with a comma. "
|
|
"Specify an empty string to match spools with no lot nr. "
|
|
"Surround a term with quotes to search for the exact term."
|
|
),
|
|
),
|
|
] = None,
|
|
allow_archived: Annotated[
|
|
bool,
|
|
Query(title="Allow Archived", description="Whether to include archived spools in the search results."),
|
|
] = False,
|
|
needs_weighing: Annotated[
|
|
Optional[bool],
|
|
Query(title="Needs Weighing", description="Filter by spools that need manual weigh-in."),
|
|
] = None,
|
|
remaining_weight_lt: Annotated[
|
|
Optional[float],
|
|
Query(
|
|
title="Remaining Weight Less Than",
|
|
description="Filter by spools with remaining weight (in grams) less than this value.",
|
|
),
|
|
] = None,
|
|
remaining_weight_gt: Annotated[
|
|
Optional[float],
|
|
Query(
|
|
title="Remaining Weight Greater Than",
|
|
description="Filter by spools with remaining weight (in grams) greater than this value.",
|
|
),
|
|
] = None,
|
|
sort: Annotated[
|
|
Optional[str],
|
|
Query(
|
|
title="Sort",
|
|
description=(
|
|
'Sort the results by the given field. Should be a comma-separate string with "field:direction" items.'
|
|
),
|
|
example="filament.name:asc,filament.vendor.id:asc,location:desc",
|
|
),
|
|
] = None,
|
|
limit: Annotated[
|
|
Optional[int],
|
|
Query(title="Limit", description="Maximum number of items in the response."),
|
|
] = None,
|
|
offset: Annotated[int, Query(title="Offset", description="Offset in the full result set if a limit is set.")] = 0,
|
|
) -> JSONResponse:
|
|
sort_by: dict[str, SortOrder] = {}
|
|
if sort is not None:
|
|
for sort_item in sort.split(","):
|
|
field, direction = sort_item.split(":")
|
|
sort_by[field] = SortOrder[direction.upper()]
|
|
|
|
filament_id = filament_id if filament_id is not None else filament_id_old
|
|
if filament_id is not None:
|
|
filament_ids = [int(filament_id_item) for filament_id_item in filament_id.split(",")]
|
|
else:
|
|
filament_ids = None
|
|
|
|
filament_vendor_id = filament_vendor_id if filament_vendor_id is not None else vendor_id_old
|
|
if filament_vendor_id is not None:
|
|
filament_vendor_ids = [int(vendor_id_item) for vendor_id_item in filament_vendor_id.split(",")]
|
|
else:
|
|
filament_vendor_ids = None
|
|
|
|
db_items, total_count = await spool.find(
|
|
db=db,
|
|
filament_name=filament_name if filament_name is not None else filament_name_old,
|
|
filament_id=filament_ids,
|
|
filament_material=filament_material if filament_material is not None else filament_material_old,
|
|
filament_color_hex=filament_color_hex,
|
|
vendor_name=filament_vendor_name if filament_vendor_name is not None else vendor_name_old,
|
|
vendor_id=filament_vendor_ids,
|
|
location=location,
|
|
lot_nr=lot_nr,
|
|
allow_archived=allow_archived,
|
|
needs_weighing=needs_weighing,
|
|
remaining_weight_lt=remaining_weight_lt,
|
|
remaining_weight_gt=remaining_weight_gt,
|
|
sort_by=sort_by,
|
|
limit=limit,
|
|
offset=offset,
|
|
)
|
|
|
|
# Set x-total-count header for pagination
|
|
return JSONResponse(
|
|
content=jsonable_encoder(
|
|
(Spool.from_db(db_item) for db_item in db_items),
|
|
exclude_none=True,
|
|
),
|
|
headers={"x-total-count": str(total_count)},
|
|
)
|
|
|
|
|
|
@router.websocket(
|
|
"",
|
|
name="Listen to spool changes",
|
|
)
|
|
async def notify_any(
|
|
websocket: WebSocket,
|
|
) -> None:
|
|
await websocket.accept()
|
|
websocket_manager.connect(("spool",), websocket)
|
|
try:
|
|
while True:
|
|
await asyncio.sleep(0.5)
|
|
if await websocket.receive_text():
|
|
await websocket.send_json({"status": "healthy"})
|
|
except WebSocketDisconnect:
|
|
websocket_manager.disconnect(("spool",), websocket)
|
|
|
|
|
|
@router.get(
|
|
"/{spool_id}",
|
|
name="Get spool",
|
|
description=(
|
|
"Get a specific spool. A websocket is served on the same path to listen for changes to the spool. "
|
|
"See the HTTP Response code 299 for the content of the websocket messages."
|
|
),
|
|
response_model_exclude_none=True,
|
|
responses={404: {"model": Message}, 299: {"model": SpoolEvent, "description": "Websocket message"}},
|
|
)
|
|
async def get(
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
) -> Spool:
|
|
db_item = await spool.get_by_id(db, spool_id)
|
|
return Spool.from_db(db_item)
|
|
|
|
|
|
@router.websocket(
|
|
"/{spool_id}",
|
|
name="Listen to spool changes",
|
|
)
|
|
async def notify(
|
|
websocket: WebSocket,
|
|
spool_id: int,
|
|
) -> None:
|
|
await websocket.accept()
|
|
websocket_manager.connect(("spool", str(spool_id)), websocket)
|
|
try:
|
|
while True:
|
|
await asyncio.sleep(0.5)
|
|
if await websocket.receive_text():
|
|
await websocket.send_json({"status": "healthy"})
|
|
except WebSocketDisconnect:
|
|
websocket_manager.disconnect(("spool", str(spool_id)), websocket)
|
|
|
|
|
|
@router.post(
|
|
"",
|
|
name="Add spool",
|
|
description=(
|
|
"Add a new spool to the database. "
|
|
"Only specify either remaining_weight or used_weight. "
|
|
"If no weight is set, the spool will be assumed to be full."
|
|
),
|
|
response_model_exclude_none=True,
|
|
response_model=Spool,
|
|
responses={
|
|
400: {"model": Message},
|
|
},
|
|
)
|
|
async def create( # noqa: ANN201
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
body: SpoolParameters,
|
|
):
|
|
if body.remaining_weight is not None and body.used_weight is not None:
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Only specify either remaining_weight or used_weight."},
|
|
)
|
|
|
|
if body.extra:
|
|
all_fields = await get_extra_fields(db, EntityType.spool)
|
|
try:
|
|
validate_extra_field_dict(all_fields, body.extra)
|
|
except ValueError as e:
|
|
return JSONResponse(status_code=400, content=Message(message=str(e)).dict())
|
|
|
|
try:
|
|
db_item = await spool.create(
|
|
db=db,
|
|
filament_id=body.filament_id,
|
|
price=body.price,
|
|
initial_weight=body.initial_weight,
|
|
spool_weight=body.spool_weight,
|
|
remaining_weight=body.remaining_weight,
|
|
used_weight=body.used_weight,
|
|
first_used=body.first_used,
|
|
last_used=body.last_used,
|
|
location=body.location,
|
|
lot_nr=body.lot_nr,
|
|
comment=body.comment,
|
|
archived=body.archived,
|
|
extra=body.extra,
|
|
)
|
|
return Spool.from_db(db_item)
|
|
except ItemCreateError:
|
|
logger.exception("Failed to create spool.")
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Failed to create spool, see server logs for more information."},
|
|
)
|
|
|
|
|
|
@router.patch(
|
|
"/{spool_id}",
|
|
name="Update spool",
|
|
description=(
|
|
"Update any attribute of a spool. "
|
|
"Only fields specified in the request will be affected. "
|
|
"remaining_weight and used_weight can't be set at the same time. "
|
|
"If extra is set, all existing extra fields will be removed and replaced with the new ones."
|
|
),
|
|
response_model_exclude_none=True,
|
|
response_model=Spool,
|
|
responses={
|
|
400: {"model": Message},
|
|
404: {"model": Message},
|
|
},
|
|
)
|
|
async def update( # noqa: ANN201
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
body: SpoolUpdateParameters,
|
|
):
|
|
patch_data = body.model_dump(exclude_unset=True)
|
|
|
|
if body.remaining_weight is not None and body.used_weight is not None:
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Only specify either remaining_weight or used_weight."},
|
|
)
|
|
|
|
if body.extra:
|
|
all_fields = await get_extra_fields(db, EntityType.spool)
|
|
try:
|
|
validate_extra_field_dict(all_fields, body.extra)
|
|
except ValueError as e:
|
|
return JSONResponse(status_code=400, content=Message(message=str(e)).dict())
|
|
|
|
try:
|
|
db_item = await spool.update(
|
|
db=db,
|
|
spool_id=spool_id,
|
|
data=patch_data,
|
|
)
|
|
except ItemCreateError:
|
|
logger.exception("Failed to update spool.")
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Failed to update spool, see server logs for more information."},
|
|
)
|
|
|
|
return Spool.from_db(db_item)
|
|
|
|
|
|
@router.delete(
|
|
"/{spool_id}",
|
|
name="Delete spool",
|
|
description="Delete a spool.",
|
|
responses={404: {"model": Message}},
|
|
)
|
|
async def delete(
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
) -> Message:
|
|
await spool.delete(db, spool_id)
|
|
return Message(message="Success!")
|
|
|
|
|
|
@router.put(
|
|
"/{spool_id}/use",
|
|
name="Use spool filament",
|
|
description=(
|
|
"Use some length or weight of filament from the spool. Specify either a length or a weight, not both."
|
|
),
|
|
response_model_exclude_none=True,
|
|
response_model=Spool,
|
|
responses={
|
|
400: {"model": Message},
|
|
404: {"model": Message},
|
|
},
|
|
)
|
|
async def use( # noqa: ANN201
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
body: SpoolUseParameters,
|
|
):
|
|
if body.use_weight is not None and body.use_length is not None:
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Only specify either use_weight or use_length."},
|
|
)
|
|
|
|
if body.use_weight is not None:
|
|
db_item = await spool.use_weight(db, spool_id, body.use_weight, comment=body.comment)
|
|
return Spool.from_db(db_item)
|
|
|
|
if body.use_length is not None:
|
|
db_item = await spool.use_length(db, spool_id, body.use_length, comment=body.comment)
|
|
return Spool.from_db(db_item)
|
|
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": "Either use_weight or use_length must be specified."},
|
|
)
|
|
|
|
|
|
@router.put(
|
|
"/{spool_id}/measure",
|
|
name="Use spool filament based on the current weight measurement",
|
|
description=("Use some weight of filament from the spool. Specify the current gross weight of the spool."),
|
|
response_model_exclude_none=True,
|
|
response_model=Spool,
|
|
responses={
|
|
400: {"model": Message},
|
|
404: {"model": Message},
|
|
},
|
|
)
|
|
async def measure( # noqa: ANN201
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
body: SpoolMeasureParameters,
|
|
):
|
|
try:
|
|
db_item = await spool.measure(db, spool_id, body.weight, comment=body.comment)
|
|
return Spool.from_db(db_item)
|
|
except SpoolMeasureError as e:
|
|
logger.exception("Failed to update spool measurement.")
|
|
return JSONResponse(
|
|
status_code=400,
|
|
content={"message": e.args[0]},
|
|
)
|
|
|
|
|
|
@router.get(
|
|
"/{spool_id}/adjustments",
|
|
name="Get spool adjustment history",
|
|
description="Get the history of all weight/length adjustments for a spool.",
|
|
response_model_exclude_none=True,
|
|
responses={
|
|
200: {"model": list[SpoolAdjustment]},
|
|
404: {"model": Message},
|
|
},
|
|
)
|
|
async def get_adjustments(
|
|
db: Annotated[AsyncSession, Depends(get_db_session)],
|
|
spool_id: int,
|
|
limit: Annotated[
|
|
Optional[int],
|
|
Query(title="Limit", description="Maximum number of items in the response."),
|
|
] = None,
|
|
offset: Annotated[int, Query(title="Offset", description="Offset in the full result set if a limit is set.")] = 0,
|
|
) -> JSONResponse:
|
|
db_items, total_count = await spool.get_adjustments(db, spool_id, limit=limit, offset=offset)
|
|
return JSONResponse(
|
|
content=jsonable_encoder(
|
|
[SpoolAdjustment.from_db(db_item) for db_item in db_items],
|
|
exclude_none=True,
|
|
),
|
|
headers={"x-total-count": str(total_count)},
|
|
)
|