diff --git a/backend/app/api/routes/spoolman.py b/backend/app/api/routes/spoolman.py index eeaf135b7..540ccfc6e 100644 --- a/backend/app/api/routes/spoolman.py +++ b/backend/app/api/routes/spoolman.py @@ -252,9 +252,7 @@ async def sync_printer_ams( current_tray_uuids.add(spool_tag.upper()) try: - sync_result = await client.sync_ams_tray( - tray, printer.name, disable_weight_sync=disable_weight_sync - ) + sync_result = await client.sync_ams_tray(tray, printer.name, disable_weight_sync=disable_weight_sync) if sync_result: synced += 1 logger.info(f"Synced {tray.tray_sub_brands} from {printer.name} AMS {ams_id} tray {tray.tray_id}") @@ -387,7 +385,9 @@ async def sync_all_printers( printer_tray_uuids[printer.name].add(spool_tag.upper()) try: - sync_result = await client.sync_ams_tray(tray, printer.name, disable_weight_sync=disable_weight_sync) + sync_result = await client.sync_ams_tray( + tray, printer.name, disable_weight_sync=disable_weight_sync + ) if sync_result: total_synced += 1 except Exception as e: diff --git a/backend/app/main.py b/backend/app/main.py index 8d69c5e4d..a226e0569 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -556,9 +556,7 @@ async def _report_partial_spoolman_usage(printer_id: int, tracking, logger): # Get spool identifier (prefer tray_uuid over tag_uid) tray_uuid = tray_info.get("tray_uuid", "") tag_uid = tray_info.get("tag_uid", "") - spool_tag = ( - tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid - ) + spool_tag = tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid if not spool_tag: logger.debug(f"[SPOOLMAN] Slot {slot_id}: no identifier for tray {global_tray_id}") @@ -635,9 +633,7 @@ async def _report_partial_spoolman_usage(printer_id: int, tracking, logger): # Get spool identifier tray_uuid = tray_info.get("tray_uuid", "") tag_uid = tray_info.get("tag_uid", "") - spool_tag = ( - tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid - ) + spool_tag = tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid if not spool_tag: continue @@ -737,9 +733,7 @@ async def _report_spoolman_usage(printer_id: int, archive_id: int, logger): # Get spool identifier (prefer tray_uuid over tag_uid) tray_uuid = tray_info.get("tray_uuid", "") tag_uid = tray_info.get("tag_uid", "") - spool_tag = ( - tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid - ) + spool_tag = tray_uuid if tray_uuid and tray_uuid != "00000000000000000000000000000000" else tag_uid if not spool_tag: logger.debug(f"[SPOOLMAN] Slot {slot_id}: no identifier for tray {global_tray_id}")