Fix broken $refs from the bambulab schema underscore-rename, remove stale v2/
- print.schema.json, _ams.schema.json, _ams_unit.schema.json still pointed at the pre-rename filenames (ams.schema.json, ams_unit.schema.json, ams_tray.schema.json) after the underscore-prefix split - fixed all three, verified with a full jsonschema + referencing validation run against real captures (get_version, pushall, a full print/ams/xcam report with both empty and loaded trays) plus negative tests. - _upgrade_state.schema.json: fixed its $id (pointed at report/info/, file lives under report/print/) and its title (said "ModuleInfo", clearly copy-pasted from _module_info.schema.json). Wired it into print.schema.json as the print report's `upgrade_state` property - the file existed but nothing referenced it yet. - Deleted schemas/bambulab/v2/, which had been recreated as stale, broken copies of an older v1 (missing the envelope allOf, missing the underscore renames, $ids still pointing at v1/ paths) - the repo's own README documents v2 as intentionally removed until V2's wire format is known to differ from V1's. - Updated schemas/bambulab/README.md's layout tree and inheritance- example reference, both stale after the underscore rename. - Removed stray tsc -b build output (packages/ts-types/src/*.d.ts/js) that isn't meant to be committed (outDir is dist/, gitignored). Verified: cargo check clean (continuum-proxy, continuum-ai-worker, rust-types), tsc clean (continuum-backend, continuum-common ts-core), 10/10 JSON Schema validation cases passing.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report.schema.json",
|
||||
"title": "BambuReport",
|
||||
"description": "Matches continuum-proxy's src/printer/bambu_commands::BambuReport. Note the category here is \"print\", not \"pushing\" — sending a pushall request (which does go to \"pushing\", see request.schema.json) makes the printer start/refresh the ongoing state-push stream, which itself arrives under \"print\". They're different root keys because a report category means 'what key does this arrive under', not 'what request caused it'. Each category's value is a oneOf for the same reason as request.schema.json: room for more than one shape per category without a rewrite later.",
|
||||
"description": "Matches continuum-proxy's src/printer/bambu_commands::BambuReport. Note the category here is \"print\", not \"pushing\" - sending a pushall request (which does go to \"pushing\", see request.schema.json) makes the printer start/refresh the ongoing state-push stream, which itself arrives under \"print\". They're different root keys because a report category means 'what key does this arrive under', not 'what request caused it'. Each category's value is a oneOf for the same reason as request.schema.json: room for more than one shape per category without a rewrite later.",
|
||||
"type": "object",
|
||||
"minProperties": 1,
|
||||
"maxProperties": 1,
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/info/_module_info.schema.json",
|
||||
"title": "ModuleInfo",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"name": { "type": "string" },
|
||||
"sw_ver": { "type": "string" },
|
||||
"hw_ver": { "type": "string" },
|
||||
"loader_ver": { "type": "string" },
|
||||
"product_name": { "type": "string" },
|
||||
"sn": { "type": "string" },
|
||||
"visible": { "type": "boolean" },
|
||||
"flag": { "type": "integer" }
|
||||
},
|
||||
"required": [
|
||||
"name",
|
||||
"sw_ver",
|
||||
"hw_ver",
|
||||
"loader_ver",
|
||||
"sn",
|
||||
"product_name",
|
||||
"visible",
|
||||
"flag"
|
||||
]
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
"reason": { "type": "string" },
|
||||
"module": {
|
||||
"type": "array",
|
||||
"items": { "$ref": "module_info.schema.json" }
|
||||
"items": { "$ref": "_module_info.schema.json" }
|
||||
}
|
||||
},
|
||||
"required": ["module"]
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/info/module_info.schema.json",
|
||||
"title": "ModuleInfo",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"hw_ver": { "type": "string" },
|
||||
"name": { "type": "string" },
|
||||
"sn": { "type": "string" },
|
||||
"sw_ver": { "type": "string" }
|
||||
},
|
||||
"required": ["hw_ver", "name", "sn", "sw_ver"]
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_ams.schema.json",
|
||||
"title": "AmsState",
|
||||
"description": "Bambu's own naming has the outer container and the inner array both called `ams` - print.ams.ams, not a typo here, just what the printer actually sends.",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"ams": {
|
||||
"type": "array",
|
||||
"items": { "$ref": "_ams_unit.schema.json" }
|
||||
},
|
||||
"ams_exists_bits": { "type": "string" },
|
||||
"tray_exist_bits": { "type": "string" },
|
||||
"tray_is_bbl_bits": { "type": "string" },
|
||||
"tray_tar": { "type": "string" },
|
||||
"tray_now": { "type": "string" },
|
||||
"tray_pre": { "type": "string" },
|
||||
"tray_read_done_bits": { "type": "string" },
|
||||
"tray_reading_bits": { "type": "string" },
|
||||
"version": { "type": "integer" },
|
||||
"insert_flag": { "type": "boolean" },
|
||||
"power_on_flag": { "type": "boolean" }
|
||||
},
|
||||
"required": ["ams"]
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_ams_tray.schema.json",
|
||||
"title": "AmsTray",
|
||||
"description": "A tray slot is either empty (just `id`) or loaded (the full field set) - two genuinely different shapes for the same slot, not one shape with optional fields. oneOf says the instance must match EXACTLY one of these. Note LoadedTray requires every field it lists, not just `id` - with only `id` required, a bare {\"id\":\"0\"} would validate against BOTH branches at once (it trivially satisfies Loaded's single requirement too) and oneOf would fail, since oneOf demands exactly one match. Verified this the hard way - see git history. The Rust equivalent is an untagged enum with #[serde(deny_unknown_fields)] on the Empty variant, for the same reason in reverse: without it, a loaded tray's extra fields wouldn't be rejected by Empty, and untagged enums try variants in order - see bambu_commands/print.rs. `drying_time` and `drying_temp` fields are only available for AMS 2 and AMS HT - AMS 1 doesn't have the drying option.",
|
||||
"oneOf": [
|
||||
{
|
||||
"title": "EmptyTray",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": { "type": "string" }
|
||||
},
|
||||
"required": ["id"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
{
|
||||
"allOf": [
|
||||
{ "$ref": "./_vt_tray.schema.json" },
|
||||
{
|
||||
"title": "LoadedTray",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"state": { "type": "integer" },
|
||||
"total_len": { "type": "number" },
|
||||
"ctype": { "type": "integer" },
|
||||
"cols": { "type": "array", "items": { "type": "string" } },
|
||||
"drying_time": { "type": "string" },
|
||||
"drying_temp": { "type": "string" }
|
||||
},
|
||||
"required": [
|
||||
"state", "total_len", "ctype", "cols"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
+12
-6
@@ -1,17 +1,23 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/ams_unit.schema.json",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_ams_unit.schema.json",
|
||||
"title": "AmsUnit",
|
||||
"description": "One physical AMS unit (Bambu's numbering starts at 0 via `id`).",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"humidity": { "type": "string" },
|
||||
"id": { "type": "string" },
|
||||
"temp": { "type": "string" },
|
||||
"tray": {
|
||||
"type": "array",
|
||||
"items": { "$ref": "ams_tray.schema.json" }
|
||||
}
|
||||
"items": { "$ref": "_ams_tray.schema.json" }
|
||||
},
|
||||
"chip_id": { "type": "string" },
|
||||
"ams_id": { "type": "string" },
|
||||
"check": { "type": "integer" },
|
||||
"id": { "type": "string" },
|
||||
"humidity": { "type": "string" },
|
||||
"humidity_raw": { "type": "string" },
|
||||
"temp": { "type": "string" },
|
||||
"dry_time": { "type": "integer" },
|
||||
"info": { "type": "string" }
|
||||
},
|
||||
"required": ["humidity", "id", "temp", "tray"]
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_upgrade_state.schema.json",
|
||||
"title": "UpgradeState",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"sequence": { "type": "string" },
|
||||
"progress": { "type": "string" },
|
||||
"status": { "type": "string", "enum": ["IDLE"]},
|
||||
"consistency_request": { "type": "boolean" },
|
||||
"dis_state": { "type": "integer" },
|
||||
"err_code": { "type": "integer" },
|
||||
"force_upgrade": { "type": "boolean" },
|
||||
"message": { "type": "string" },
|
||||
"module": { "type": "string" },
|
||||
"new_version_state": { "type": "integer" },
|
||||
"cur_state_code": { "type": "integer" },
|
||||
"idx2": { "type": "integer" },
|
||||
"new_ver_list": { "type": "array", "items": { "type": "string" } }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_vt_tray.schema.json",
|
||||
"title": "VtTray",
|
||||
"description": "This schema is used as Virtual Tray (external spool) or as a base for AmsTray. When empty, all values are zeroed and `tray_color` field is set to \"FFFFFF00\".",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": { "type": "string" },
|
||||
"tag_uid": { "type": "string" },
|
||||
"tray_id_name": { "type": "string" },
|
||||
"tray_info_idx": { "type": "string" },
|
||||
"tray_type": { "type": "string" },
|
||||
"tray_sub_brands": { "type": "string" },
|
||||
"tray_color": { "type": "string" },
|
||||
"tray_weight": { "type": "string" },
|
||||
"tray_diameter": { "type": "string" },
|
||||
"tray_temp": { "type": "string" },
|
||||
"tray_time": { "type": "string" },
|
||||
"bed_temp_type": { "type": "string" },
|
||||
"bed_temp": { "type": "string" },
|
||||
"nozzle_temp_min": { "type": "string" },
|
||||
"nozzle_temp_max": { "type": "string" },
|
||||
"xcam_info": { "type": "string" },
|
||||
"tray_uuid": { "type": "string" },
|
||||
"remain": { "type": "integer", "minimum": 0 },
|
||||
"k": { "type": "number" },
|
||||
"n": { "type": "number" },
|
||||
"cali_idx": { "type": "number" }
|
||||
},
|
||||
"required": [
|
||||
"id", "remain", "bed_temp", "bed_temp_type",
|
||||
"nozzle_temp_max", "nozzle_temp_min", "tag_uid", "tray_color",
|
||||
"tray_diameter", "tray_id_name", "tray_info_idx", "tray_sub_brands",
|
||||
"tray_type", "tray_uuid", "tray_weight", "xcam_info", "k", "n"
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/xcam.schema.json",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/_xcam.schema.json",
|
||||
"title": "XcamSettings",
|
||||
"description": "Camera-based AI print monitoring settings (spaghetti detection, first-layer inspection, etc.).",
|
||||
"type": "object",
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/ams.schema.json",
|
||||
"title": "AmsState",
|
||||
"description": "Bambu's own naming has the outer container and the inner array both called `ams` — print.ams.ams, not a typo here, just what the printer actually sends.",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"ams": {
|
||||
"type": "array",
|
||||
"items": { "$ref": "ams_unit.schema.json" }
|
||||
}
|
||||
},
|
||||
"required": ["ams"]
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/ams_tray.schema.json",
|
||||
"title": "AmsTray",
|
||||
"description": "A tray slot is either empty (just `id`) or loaded (the full field set) — two genuinely different shapes for the same slot, not one shape with optional fields. oneOf says the instance must match EXACTLY one of these. Note LoadedTray requires every field it lists, not just `id` — with only `id` required, a bare {\"id\":\"0\"} would validate against BOTH branches at once (it trivially satisfies Loaded's single requirement too) and oneOf would fail, since oneOf demands exactly one match. Verified this the hard way — see git history. The Rust equivalent is an untagged enum with #[serde(deny_unknown_fields)] on the Empty variant, for the same reason in reverse: without it, a loaded tray's extra fields wouldn't be rejected by Empty, and untagged enums try variants in order — see bambu_commands/print.rs.",
|
||||
"oneOf": [
|
||||
{
|
||||
"title": "EmptyTray",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": { "type": "string" }
|
||||
},
|
||||
"required": ["id"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
{
|
||||
"title": "LoadedTray",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": { "type": "string" },
|
||||
"bed_temp": { "type": "string" },
|
||||
"bed_temp_type": { "type": "string" },
|
||||
"cols": { "type": "array", "items": { "type": "string" } },
|
||||
"drying_temp": { "type": "string" },
|
||||
"drying_time": { "type": "string" },
|
||||
"nozzle_temp_max": { "type": "string" },
|
||||
"nozzle_temp_min": { "type": "string" },
|
||||
"remain": { "type": "integer" },
|
||||
"tag_uid": { "type": "string" },
|
||||
"tray_color": { "type": "string" },
|
||||
"tray_diameter": { "type": "string" },
|
||||
"tray_id_name": { "type": "string" },
|
||||
"tray_info_idx": { "type": "string" },
|
||||
"tray_sub_brands": { "type": "string" },
|
||||
"tray_type": { "type": "string" },
|
||||
"tray_uuid": { "type": "string" },
|
||||
"tray_weight": { "type": "string" },
|
||||
"xcam_info": { "type": "string" }
|
||||
},
|
||||
"required": [
|
||||
"id", "bed_temp", "bed_temp_type", "cols", "drying_temp", "drying_time",
|
||||
"nozzle_temp_max", "nozzle_temp_min", "remain", "tag_uid", "tray_color",
|
||||
"tray_diameter", "tray_id_name", "tray_info_idx", "tray_sub_brands",
|
||||
"tray_type", "tray_uuid", "tray_weight", "xcam_info"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -2,16 +2,22 @@
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/report/print/print.schema.json",
|
||||
"title": "PrintReport",
|
||||
"description": "The ongoing print-state push (root key \"print\") — NOT a direct reply to the pushall request (that goes to \"pushing\", see request/pushing/pushall.schema.json). Sending pushall makes the printer start/refresh this stream; it isn't itself request/response, which is also why this is its own category folder rather than sitting under pushing/ — a category here is 'what root key does this arrive under', not 'what triggered it'. Doesn't extend envelope.schema.json: the example seen so far doesn't show sequence_id/command on this one, and it may genuinely not carry them (an async push, not a direct reply) — revisit if a real capture proves otherwise. The real payload has many more fields than shown here (this example was truncated) — add them under `properties` the same way you'd add them to bambu_commands/print.rs.",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"ams": { "$ref": "ams.schema.json" },
|
||||
"ams_exist_bits": { "type": "string" },
|
||||
"insert_flag": { "type": "boolean" },
|
||||
"power_on_flag": { "type": "boolean" },
|
||||
"tray_exist_bits": { "type": "string" },
|
||||
"tray_is_bbl_bits": { "type": "string" },
|
||||
"xcam": { "$ref": "xcam.schema.json" },
|
||||
"xcam_status": { "type": "string" }
|
||||
}
|
||||
"description": "The ongoing print-state push (root key \"print\") - NOT a direct reply to the pushall request (that goes to \"pushing\", see request/pushing/pushall.schema.json). Sending pushall makes the printer start/refresh this stream; it isn't itself request/response, which is also why this is its own category folder rather than sitting under pushing/ - a category here is 'what root key does this arrive under', not 'what triggered it'.",
|
||||
"allOf": [
|
||||
{ "$ref": "../../../envelope.schema.json" },
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"ams": { "$ref": "_ams.schema.json" },
|
||||
"ams_exist_bits": { "type": "string" },
|
||||
"insert_flag": { "type": "boolean" },
|
||||
"power_on_flag": { "type": "boolean" },
|
||||
"tray_exist_bits": { "type": "string" },
|
||||
"tray_is_bbl_bits": { "type": "string" },
|
||||
"upgrade_state": { "$ref": "_upgrade_state.schema.json" },
|
||||
"xcam": { "$ref": "_xcam.schema.json" },
|
||||
"xcam_status": { "type": "string" }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://git.octoturge.com/Continuum/continuum-schemas/raw/branch/main/schemas/bambulab/v1/request.schema.json",
|
||||
"title": "BambuRequest",
|
||||
"description": "Matches continuum-proxy's src/printer/bambu_commands::BambuRequest — one JSON key naming the category ('info', 'pushing', ...). Each category's value is a oneOf, not a single $ref: a category can have more than one possible request shape (e.g. 'info' might grow a second command besides get_version) — oneOf leaves room for that from the start instead of needing a rewrite the day it happens.",
|
||||
"description": "Matches continuum-proxy's src/printer/bambu_commands::BambuRequest - one JSON key naming the category ('info', 'pushing', ...). Each category's value is a oneOf, not a single $ref: a category can have more than one possible request shape (e.g. 'info' might grow a second command besides get_version) - oneOf leaves room for that from the start instead of needing a rewrite the day it happens.",
|
||||
"type": "object",
|
||||
"minProperties": 1,
|
||||
"maxProperties": 1,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"command": { "const": "pushall" },
|
||||
"version": { "type": "integer" },
|
||||
"version": { "type": "integer", "minimum": 1, "maximum": 1 },
|
||||
"push_target": { "type": "integer" }
|
||||
},
|
||||
"required": ["version", "push_target"]
|
||||
|
||||
Reference in New Issue
Block a user