diff --git a/README.md b/README.md
index f28c6d8..25a47e8 100644
--- a/README.md
+++ b/README.md
@@ -71,10 +71,11 @@ This feature has currently following issues/drawbacks:
- TODO: what about locally run file?
- TODO: test with multiple AMS
- TODO: filament usage in external spool
- - Evidently needed GUI improvements
- Code cleanup
- Video showcase
- Docker compose SSL
- Logs
- TODOs
- - Bambu Spools have apparently two RFID chips with two distinct UIDs so if you swap the filament to different tray it may fail, needs rework/testing
+ - Click to resolve issue
+ - More template components / less copy&paste
+ - Better Tray naming
diff --git a/__version__.py b/__version__.py
index 699a98c..eae19a6 100644
--- a/__version__.py
+++ b/__version__.py
@@ -1 +1 @@
-__version__ = '0.0.2'
+__version__ = '0.1.0'
diff --git a/app.py b/app.py
index 123d38b..1dbfc0f 100644
--- a/app.py
+++ b/app.py
@@ -2,73 +2,48 @@ import json
import traceback
import uuid
-from flask import Flask, request, render_template_string
+from flask import Flask, request, render_template, redirect, url_for
-from config import BASE_URL
+from config import BASE_URL, AUTO_SPEND
from filament import generate_filament_brand_code, generate_filament_temperatures
+from frontend_utils import color_is_dark
from messages import AMS_FILAMENT_SETTING
from mqtt_bambulab import fetchSpools, getLastAMSConfig, publish, getMqttClient, setActiveTray
from spoolman_client import patchExtraTags, getSpoolById
+from spoolman_service import augmentTrayDataWithSpoolMan, trayUid
app = Flask(__name__)
-
@app.route("/spool_info")
def spool_info():
- tag_id = request.args.get("tag_id")
+ try:
+ tag_id = request.args.get("tag_id")
- last_ams_config = getLastAMSConfig()
- ams_data = last_ams_config.get("ams", [])
- vt_tray_data = last_ams_config.get("vt_tray", {})
+ last_ams_config = getLastAMSConfig()
+ ams_data = last_ams_config.get("ams", [])
+ vt_tray_data = last_ams_config.get("vt_tray", {})
- print(ams_data)
- print(vt_tray_data)
+ print(ams_data)
+ print(vt_tray_data)
- if not tag_id:
- return "TAG ID is required as a query parameter (e.g., ?tagid=RFID123)"
+ if not tag_id:
+ return "TAG ID is required as a query parameter (e.g., ?tagid=RFID123)"
- spools = fetchSpools()
- current_spool = None
- for spool in spools:
- if not spool.get("extra", {}).get("tag"):
- continue
- tag = json.loads(spool["extra"]["tag"])
- if tag != tag_id:
- continue
- current_spool = spool
+ spools = fetchSpools()
+ current_spool = None
+ for spool in spools:
+ if not spool.get("extra", {}).get("tag"):
+ continue
+ tag = json.loads(spool["extra"]["tag"])
+ if tag != tag_id:
+ continue
+ current_spool = spool
- # Generate HTML for AMS selection
- html = f"""
- Spool information
- """
- if current_spool:
- html += f"Current Spool: {current_spool}
"
- html += """
- AMS
-
- """
-
- for ams in ams_data:
- html += f"AMS {ams['id']} (Humidity: {ams['humidity']}%, Temp: {ams['temp']}°C)"
- for tray in ams["tray"]:
- tray_status = f"[{tray['tray_sub_brands']} {tray['tray_color']}]"
- html += f"""
-
- Tray {tray['id']} {tray_status} - Remaining: {tray['remain']}%
- Pick this tray
-
- """
- html += " "
- html += " "
- html += f"""
- External Spool
-
- Tray {vt_tray_data['id']} [{vt_tray_data['tray_sub_brands']} {vt_tray_data['tray_color']}] - Remaining: {vt_tray_data['remain']}%
- Pick this tray
-
- """
-
- return render_template_string(html)
+ # TODO: missing current_spool
+ return render_template('spool_info.html', tag_id=tag_id, current_spool=current_spool, ams_data=ams_data, vt_tray_data=vt_tray_data, color_is_dark=color_is_dark, AUTO_SPEND=AUTO_SPEND)
+ except Exception as e:
+ traceback.print_exc()
+ return render_template('error.html', exception=str(e))
@app.route("/tray_load")
@@ -116,101 +91,63 @@ def tray_load():
print(ams_message)
publish(getMqttClient(), ams_message)
- return f"""
- Success
- Updated Spool ID {spool_id} with TAG id {tag_id} to AMS {ams_id}, Tray {tray_id}.
- """
+ return redirect(url_for('home', success_message=f"Updated Spool ID {spool_id} with TAG id {tag_id} to AMS {ams_id}, Tray {tray_id}."))
except Exception as e:
traceback.print_exc()
- return f"Error {str(e)}
"
+ return render_template('error.html', exception=str(e))
@app.route("/")
def home():
try:
- spools = fetchSpools()
-
last_ams_config = getLastAMSConfig()
ams_data = last_ams_config.get("ams", [])
vt_tray_data = last_ams_config.get("vt_tray", {})
+ spool_list = fetchSpools()
+ success_message = request.args.get("success_message")
- html = """
- Current AMS Configuration
- """
- html += """
- AMS
-
- """
+ issue = False
+ #TODO: recheck tray ID and external spool ID and extract it to constant
+ augmentTrayDataWithSpoolMan(spool_list, vt_tray_data, trayUid(vt_tray_data["id"], 255))
+ issue |= vt_tray_data["issue"]
for ams in ams_data:
- html += f"AMS {ams['id']} (Humidity: {ams['humidity']}%, Temp: {ams['temp']}°C)"
for tray in ams["tray"]:
- tray_status = f"[{tray['tray_sub_brands']} {tray['tray_color']}]"
- html += f"""
-
- Tray {tray['id']} {tray_status} - Remaining: {tray['remain']}%
-
- """
- html += " "
- html += " "
- html += f"""
- External Spool
-
- Tray {vt_tray_data['id']} [{vt_tray_data['tray_sub_brands']} {vt_tray_data['tray_color']}] - Remaining: {vt_tray_data['remain']}%
-
- """
- html += """
- Add new TAG
- "
- return html
+ augmentTrayDataWithSpoolMan(spool_list, tray, trayUid(ams["id"], tray["id"]))
+ issue |= tray["issue"]
+
+ return render_template('index.html', success_message=success_message, ams_data=ams_data, vt_tray_data=vt_tray_data, color_is_dark=color_is_dark, AUTO_SPEND=AUTO_SPEND, issue=issue)
except Exception as e:
traceback.print_exc()
- return f"Error {str(e)}
"
-
+ return render_template('error.html', exception=str(e))
@app.route("/assign_tag")
def assign_tag():
- spool_id = request.args.get("spool_id")
+ try:
+ spools = fetchSpools()
- if not spool_id:
- return "spool ID is required as a query parameter (e.g., ?spool_id=1)"
+ return render_template('assign_tag.html', spools=spools)
+ except Exception as e:
+ traceback.print_exc()
+ return render_template('error.html', exception=str(e))
- myuuid = str(uuid.uuid4())
+@app.route("/write_tag")
+def write_tag():
+ try:
+ spool_id = request.args.get("spool_id")
- patchExtraTags(spool_id, {}, {
- "tag": json.dumps(myuuid),
- })
+ if not spool_id:
+ return "spool ID is required as a query parameter (e.g., ?spool_id=1)"
- return f"""
-
-
-
- NFC Write
- Write
- `-`` all receive top and bottom margins. We nuke the top\n// margin for easier control within type scales as it avoids margin collapsing.\n\n%heading {\n margin-top: 0; // 1\n margin-bottom: $headings-margin-bottom;\n font-family: $headings-font-family;\n font-style: $headings-font-style;\n font-weight: $headings-font-weight;\n line-height: $headings-line-height;\n color: var(--#{$prefix}heading-color);\n}\n\nh1 {\n @extend %heading;\n @include font-size($h1-font-size);\n}\n\nh2 {\n @extend %heading;\n @include font-size($h2-font-size);\n}\n\nh3 {\n @extend %heading;\n @include font-size($h3-font-size);\n}\n\nh4 {\n @extend %heading;\n @include font-size($h4-font-size);\n}\n\nh5 {\n @extend %heading;\n @include font-size($h5-font-size);\n}\n\nh6 {\n @extend %heading;\n @include font-size($h6-font-size);\n}\n\n\n// Reset margins on paragraphs\n//\n// Similarly, the top margin on ` `s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\n\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n\n// Abbreviations\n//\n// 1. Add the correct text decoration in Chrome, Edge, Opera, and Safari.\n// 2. Add explicit cursor to indicate changed behavior.\n// 3. Prevent the text-decoration to be skipped.\n\nabbr[title] {\n text-decoration: underline dotted; // 1\n cursor: help; // 2\n text-decoration-skip-ink: none; // 3\n}\n\n\n// Address\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\n\n// Lists\n\nol,\nul {\n padding-left: 2rem;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\n// 1. Undo browser default\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // 1\n}\n\n\n// Blockquote\n\nblockquote {\n margin: 0 0 1rem;\n}\n\n\n// Strong\n//\n// Add the correct font weight in Chrome, Edge, and Safari\n\nb,\nstrong {\n font-weight: $font-weight-bolder;\n}\n\n\n// Small\n//\n// Add the correct font size in all browsers\n\nsmall {\n @include font-size($small-font-size);\n}\n\n\n// Mark\n\nmark {\n padding: $mark-padding;\n color: var(--#{$prefix}highlight-color);\n background-color: var(--#{$prefix}highlight-bg);\n}\n\n\n// Sub and Sup\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n\nsub,\nsup {\n position: relative;\n @include font-size($sub-sup-font-size);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n// Links\n\na {\n color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));\n text-decoration: $link-decoration;\n\n &:hover {\n --#{$prefix}link-color-rgb: var(--#{$prefix}link-hover-color-rgb);\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([class]) {\n &,\n &:hover {\n color: inherit;\n text-decoration: none;\n }\n}\n\n\n// Code\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-code;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\n// 1. Remove browser default top margin\n// 2. Reset browser default of `1em` to use `rem`s\n// 3. Don't allow content to break outside\n\npre {\n display: block;\n margin-top: 0; // 1\n margin-bottom: 1rem; // 2\n overflow: auto; // 3\n @include font-size($code-font-size);\n color: $pre-color;\n\n // Account for some code outputs that place code tags in pre tags\n code {\n @include font-size(inherit);\n color: inherit;\n word-break: normal;\n }\n}\n\ncode {\n @include font-size($code-font-size);\n color: var(--#{$prefix}code-color);\n word-wrap: break-word;\n\n // Streamline the style when inside anchors to avoid broken underline and more\n a > & {\n color: inherit;\n }\n}\n\nkbd {\n padding: $kbd-padding-y $kbd-padding-x;\n @include font-size($kbd-font-size);\n color: $kbd-color;\n background-color: $kbd-bg;\n @include border-radius($border-radius-sm);\n\n kbd {\n padding: 0;\n @include font-size(1em);\n font-weight: $nested-kbd-font-weight;\n }\n}\n\n\n// Figures\n//\n// Apply a consistent margin strategy (matches our type styles).\n\nfigure {\n margin: 0 0 1rem;\n}\n\n\n// Images and content\n\nimg,\nsvg {\n vertical-align: middle;\n}\n\n\n// Tables\n//\n// Prevent double borders\n\ntable {\n caption-side: bottom;\n border-collapse: collapse;\n}\n\ncaption {\n padding-top: $table-cell-padding-y;\n padding-bottom: $table-cell-padding-y;\n color: $table-caption-color;\n text-align: left;\n}\n\n// 1. Removes font-weight bold by inheriting\n// 2. Matches default `
` alignment by inheriting `text-align`.\n// 3. Fix alignment for Safari\n\nth {\n font-weight: $table-th-font-weight; // 1\n text-align: inherit; // 2\n text-align: -webkit-match-parent; // 3\n}\n\nthead,\ntbody,\ntfoot,\ntr,\ntd,\nth {\n border-color: inherit;\n border-style: solid;\n border-width: 0;\n}\n\n\n// Forms\n//\n// 1. Allow labels to use `margin` for spacing.\n\nlabel {\n display: inline-block; // 1\n}\n\n// Remove the default `border-radius` that macOS Chrome adds.\n// See https://github.com/twbs/bootstrap/issues/24093\n\nbutton {\n // stylelint-disable-next-line property-disallowed-list\n border-radius: 0;\n}\n\n// Explicitly remove focus outline in Chromium when it shouldn't be\n// visible (e.g. as result of mouse click or touch tap). It already\n// should be doing this automatically, but seems to currently be\n// confused and applies its very visible two-tone outline anyway.\n\nbutton:focus:not(:focus-visible) {\n outline: 0;\n}\n\n// 1. Remove the margin in Firefox and Safari\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n margin: 0; // 1\n font-family: inherit;\n @include font-size(inherit);\n line-height: inherit;\n}\n\n// Remove the inheritance of text transform in Firefox\nbutton,\nselect {\n text-transform: none;\n}\n// Set the cursor for non-`` buttons\n//\n// Details at https://github.com/twbs/bootstrap/pull/30562\n[role=\"button\"] {\n cursor: pointer;\n}\n\nselect {\n // Remove the inheritance of word-wrap in Safari.\n // See https://github.com/twbs/bootstrap/issues/24990\n word-wrap: normal;\n\n // Undo the opacity change from Chrome\n &:disabled {\n opacity: 1;\n }\n}\n\n// Remove the dropdown arrow only from text type inputs built with datalists in Chrome.\n// See https://stackoverflow.com/a/54997118\n\n[list]:not([type=\"date\"]):not([type=\"datetime-local\"]):not([type=\"month\"]):not([type=\"week\"]):not([type=\"time\"])::-webkit-calendar-picker-indicator {\n display: none !important;\n}\n\n// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`\n// controls in Android 4.\n// 2. Correct the inability to style clickable types in iOS and Safari.\n// 3. Opinionated: add \"hand\" cursor to non-disabled button elements.\n\nbutton,\n[type=\"button\"], // 1\n[type=\"reset\"],\n[type=\"submit\"] {\n -webkit-appearance: button; // 2\n\n @if $enable-button-pointers {\n &:not(:disabled) {\n cursor: pointer; // 3\n }\n }\n}\n\n// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.\n\n::-moz-focus-inner {\n padding: 0;\n border-style: none;\n}\n\n// 1. Textareas should really only resize vertically so they don't break their (horizontal) containers.\n\ntextarea {\n resize: vertical; // 1\n}\n\n// 1. Browsers set a default `min-width: min-content;` on fieldsets,\n// unlike e.g. `