diff --git a/test_data.py b/test_data.py
index 5fad4e68..0c670ac9 100644
--- a/test_data.py
+++ b/test_data.py
@@ -122,11 +122,11 @@ def getLastAMSConfig():
vt_tray = config.get("vt_tray")
if vt_tray:
- augmentTrayDataWithSpoolMan(spool_list, vt_tray, trayUid(EXTERNAL_SPOOL_AMS_ID, EXTERNAL_SPOOL_ID))
+ augmentTrayDataWithSpoolMan(spool_list, vt_tray, EXTERNAL_SPOOL_AMS_ID, EXTERNAL_SPOOL_ID)
for ams in config.get("ams", []):
for tray in ams.get("tray", []):
- augmentTrayDataWithSpoolMan(spool_list, tray, trayUid(ams.get("id"), tray.get("id")))
+ augmentTrayDataWithSpoolMan(spool_list, tray, ams.get("id"), tray.get("id"))
return config
diff --git a/tests/test_ams_model_detection.py b/tests/test_ams_model_detection.py
new file mode 100644
index 00000000..652595f7
--- /dev/null
+++ b/tests/test_ams_model_detection.py
@@ -0,0 +1,43 @@
+import mqtt_bambulab
+
+
+def test_identifies_ams_lite_module():
+ module = {"name": "ams_f1/0", "product_name": "AMS Lite"}
+ assert mqtt_bambulab.identify_ams_model_from_module(module) == "AMS Lite"
+
+
+def test_identifies_ams_2_pro_module():
+ module = {"name": "n3f/1", "product_name": "AMS 2 Pro (2)"}
+ assert mqtt_bambulab.identify_ams_model_from_module(module) == "AMS 2 Pro"
+
+
+def test_identifies_ams_ht_module():
+ module = {"name": "ams_ht/0", "product_name": "AMS HT"}
+ assert mqtt_bambulab.identify_ams_model_from_module(module) == "AMS HT"
+
+
+def test_falls_back_to_ams_when_name_matches():
+ module = {"name": "ams/3", "product_name": "AMS (3)"}
+ assert mqtt_bambulab.identify_ams_model_from_module(module) == "AMS"
+
+
+def test_detects_multiple_modules():
+ modules = [
+ {"name": "ams_f1/0", "product_name": "AMS Lite"},
+ {"name": "n3f/0", "product_name": "AMS 2 Pro (1)"},
+ {"name": "ams/0", "product_name": "AMS"},
+ ]
+ results = mqtt_bambulab.identify_ams_models_from_modules(modules)
+ assert results["ams_f1/0"]["model"] == "AMS Lite"
+ assert results["n3f/0"]["model"] == "AMS 2 Pro"
+ assert results["ams/0"]["model"] == "AMS"
+
+
+def test_detects_models_by_numeric_id():
+ modules = [
+ {"name": "ams_f1/0", "product_name": "AMS Lite"},
+ {"name": "n3f/1", "product_name": "AMS 2 Pro (2)"},
+ ]
+ results = mqtt_bambulab.identify_ams_models_by_id(modules)
+ assert results[0] == "AMS Lite"
+ assert results[1] == "AMS 2 Pro"
diff --git a/tests/test_filament_mismatch.py b/tests/test_filament_mismatch.py
index 0d111600..e52a3ced 100644
--- a/tests/test_filament_mismatch.py
+++ b/tests/test_filament_mismatch.py
@@ -14,13 +14,13 @@ def _make_tray(tray_type, tray_sub_brands, tray_id="tray-1"):
}
-def _make_spool(material, extra_type, tray_id="tray-1", spool_id=1, spool_extra_type=None):
+def _make_spool(material, extra_type, ams_id=0, tray_id="tray-1", spool_id=1, spool_extra_type=None):
return {
"id": spool_id,
"remaining_weight": 1000,
# SpoolMan may carry a type in spool.extra; include it when provided.
"extra": {
- "active_tray": json.dumps(tray_id),
+ "active_tray": json.dumps(svc.trayUid(ams_id, tray_id)),
**({"type": spool_extra_type if spool_extra_type is not None else extra_type} if (spool_extra_type is not None or extra_type) else {}),
},
"filament": {
@@ -33,11 +33,11 @@ def _make_spool(material, extra_type, tray_id="tray-1", spool_id=1, spool_extra_
}
-def _run_case(tray, spool, tray_id="tray-1"):
+def _run_case(tray, spool, ams_id=0, tray_id="tray-1"):
spool_list = [spool]
# avoid file writes during tests
svc._log_filament_mismatch = lambda *args, **kwargs: None
- svc.augmentTrayDataWithSpoolMan(spool_list, tray, tray_id)
+ svc.augmentTrayDataWithSpoolMan(spool_list, tray, ams_id, tray_id)
return tray
diff --git a/tests/test_tray_remaining.py b/tests/test_tray_remaining.py
new file mode 100644
index 00000000..610a4318
--- /dev/null
+++ b/tests/test_tray_remaining.py
@@ -0,0 +1,39 @@
+from jinja2 import Environment, FileSystemLoader
+
+
+def _render_tray(*, tray_data, ams_models_by_id):
+ env = Environment(loader=FileSystemLoader("templates"))
+ env.globals.update(
+ AUTO_SPEND=False,
+ AMS_MODELS_BY_ID=ams_models_by_id,
+ SPOOLMAN_BASE_URL="http://spoolman",
+ color_is_dark=lambda _: False,
+ url_for=lambda endpoint, **_kwargs: f"/{endpoint}",
+ )
+ template = env.get_template("fragments/tray.html")
+ return template.render(tray_data=tray_data, ams_id=0, pick_tray=False, tray_id=0)
+
+
+def _unmapped_tray_data():
+ return {
+ "id": 0,
+ "tray_type": "PLA",
+ "tray_color": "FFFFFF",
+ "bambu_material": "PLA",
+ "bambu_color": "FFFFFF",
+ "bambu_sub_brand": "Matte",
+ "remain": 42,
+ "unmapped_bambu_tag": "C0FFEE",
+ "last_used": "-",
+ }
+
+
+def test_unmapped_remaining_hidden_for_ams_lite():
+ html = _render_tray(tray_data=_unmapped_tray_data(), ams_models_by_id={0: "AMS Lite"})
+ assert "Remaining" not in html
+
+
+def test_unmapped_remaining_shown_for_other_models():
+ html = _render_tray(tray_data=_unmapped_tray_data(), ams_models_by_id={0: "AMS"})
+ assert "Remaining" in html
+ assert "42%" in html