Skip to content

Improve MaterialProperties validation #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CZDanol merged 3 commits into from
Jun 9, 2026
Merged

Improve MaterialProperties validation #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f1849a
generate_schema: Fix entity_schema
CZDanol Jun 9, 2026
783edeb
schema: Improve MaterialProperties handling
CZDanol Jun 9, 2026
0bdbbbc
schema: Improve MaterialContainer validation
CZDanol Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions schema/generate_db_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,28 +97,35 @@ def add_slug_property(schema: dict):
register_type_schema("MaterialColor", object_ref_schema("material_color"))
register_type_schema("set(MaterialColor)", array_schema(type_schema("MaterialColor", None)))

generate_schema_file("material", add_slug_property(entity_schema(entity_yaml(materials_yaml, "Material"))))
generate_schema_file(
"material",
add_slug_property(entity_schema(entity_yaml(materials_yaml, "Material"))),
{
"allOf": [
{
"if": {"properties": {"class": {"const": "FFF"}}},
"then": {"properties": {"properties": {"$ref": "fff_material_properties.schema.json"}}},
},
{
"if": {"properties": {"class": {"const": "SLA"}}},
"then": {"properties": {"properties": {"$ref": "sla_material_properties.schema.json"}}},
},
],
},
)
generate_schema_file("material_type", entity_schema(entity_yaml(materials_yaml, "MaterialType")))

generate_schema_file(
"fff_material_properties",
entity_schema(entity_yaml(materials_yaml, "FFFMaterialProperties"), include_inherits=False),
entity_schema(entity_yaml(materials_yaml, "FFFMaterialProperties"), include_inherits=True),
)
generate_schema_file(
"sla_material_properties",
entity_schema(entity_yaml(materials_yaml, "SLAMaterialProperties"), include_inherits=False),
entity_schema(entity_yaml(materials_yaml, "SLAMaterialProperties"), include_inherits=True),
)

generate_schema_file(
"material_properties",
entity_schema(entity_yaml(materials_yaml, "MaterialProperties")),
{
"anyOf": [
{"$ref": "fff_material_properties.schema.json"},
{"$ref": "sla_material_properties.schema.json"},
],
},
)

generate_schema_file("material_properties", entity_schema(entity_yaml(materials_yaml, "MaterialProperties"), include_inherits=False))

brands_yaml = read_yaml("brands")

Expand Down Expand Up @@ -164,14 +171,14 @@ def add_slug_property(schema: dict):
"properties": {
"class": material_class_schema,
},
"oneOf": [
"allOf": [
{
"properties": {"class": {"const": "FFF"}},
"$ref": "fff_material_container.schema.json",
"if": {"properties": {"class": {"const": "FFF"}}},
"then": {"$ref": "fff_material_container.schema.json"},
},
{
"properties": {"class": {"const": "SLA"}},
"$ref": "sla_material_container.schema.json",
"if": {"properties": {"class": {"const": "SLA"}}},
"then": {"$ref": "sla_material_container.schema.json"},
},
],
},
Expand Down
4 changes: 3 additions & 1 deletion schema/generate_schema_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,14 @@ def is_field_excluded(field_name):

return False

all_field_names = set()
for field in yaml["fields"]:
if not field.get(filter_field, True):
continue

field_name = field["name"]
all_field_names.add(field_name)

if is_field_excluded(field_name):
continue

Expand Down Expand Up @@ -139,7 +142,6 @@ def is_field_excluded(field_name):
if include_inherits:
result = recursive_merge(result, type_schema(parent, []))

all_field_names = set(result["properties"].keys())
assert len(fields_blacklist - all_field_names) == 0, f"{yaml['name']}: Nonexistent field blacklisted: {fields_blacklist - all_field_names}"
assert (fields_whitelist is None) or len(fields_whitelist - all_field_names) == 0, f"{yaml['name']}: Nonexistent field whitelisted: {fields_whitelist - all_field_names}"

Expand Down
4 changes: 3 additions & 1 deletion schema/generated/opt_db_schema/fff_material_properties.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,7 @@
"max_print_temperature",
"min_bed_temperature",
"max_bed_temperature"
]
],
"unevaluatedProperties": false,
"$ref": "material_properties.schema.json"
}
36 changes: 35 additions & 1 deletion schema/generated/opt_db_schema/material.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,39 @@
"name",
"abbreviation"
],
"unevaluatedProperties": false
"unevaluatedProperties": false,
"allOf": [
{
"if": {
"properties": {
"class": {
"const": "FFF"
}
}
},
"then": {
"properties": {
"properties": {
"$ref": "fff_material_properties.schema.json"
}
}
}
},
{
"if": {
"properties": {
"class": {
"const": "SLA"
}
}
},
"then": {
"properties": {
"properties": {
"$ref": "sla_material_properties.schema.json"
}
}
}
}
]
}
26 changes: 17 additions & 9 deletions schema/generated/opt_db_schema/material_container.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,30 @@
"name"
],
"unevaluatedProperties": false,
"oneOf": [
"allOf": [
{
"properties": {
"class": {
"const": "FFF"
"if": {
"properties": {
"class": {
"const": "FFF"
}
}
},
"$ref": "fff_material_container.schema.json"
"then": {
"$ref": "fff_material_container.schema.json"
}
},
{
"properties": {
"class": {
"const": "SLA"
"if": {
"properties": {
"class": {
"const": "SLA"
}
}
},
"$ref": "sla_material_container.schema.json"
"then": {
"$ref": "sla_material_container.schema.json"
}
}
]
}
11 changes: 1 addition & 10 deletions schema/generated/opt_db_schema/material_properties.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,5 @@
"description": "Hardness of the material on the Shore D scale"
}
},
"required": [],
"unevaluatedProperties": false,
"anyOf": [
{
"$ref": "fff_material_properties.schema.json"
},
{
"$ref": "sla_material_properties.schema.json"
}
]
"required": []
}
4 changes: 3 additions & 1 deletion schema/generated/opt_db_schema/sla_material_properties.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@
"description": "Viscosity of the material at 60 \u00b0C"
}
},
"required": []
"required": [],
"unevaluatedProperties": false,
"$ref": "material_properties.schema.json"
}
Loading