Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions data/material-containers/prusament-resin-1kg-bottle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ class: SLA
brand:
slug: prusament-resin
name: Prusament Resin 1kg Bottle
volumetric_capacity: 1000
empty_weight: 105
volumetric_capacity: 950
empty_weight: 120
4 changes: 2 additions & 2 deletions data/material-containers/prusament-resin-5kg-canister.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ class: SLA
brand:
slug: prusament-resin
name: Prusament Resin 5kg Canister
volumetric_capacity: 5000
empty_weight: 285
volumetric_capacity: 4760
empty_weight: 300
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
uuid: 20457c12-f923-4d30-a904-7973356137dc
slug: prusament-resin-wash-medium-canister
class: SLA
brand:
slug: prusament-resin
name: Prusament Resin Wash Medium Canister
volumetric_capacity: 30000
8 changes: 4 additions & 4 deletions data/materials/forward-am/forward-am-ultracur3d-rg-35-b.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ primary_color:
properties:
density: 1.11
cure_wavelength: 405
viscosity_18c: 530
viscosity_25c: 312
viscosity_40c: 127
viscosity_60c: 51
viscosity_18c: 1798
viscosity_25c: 925
viscosity_40c: 279
viscosity_60c: 87
4 changes: 4 additions & 0 deletions data/materials/forward-am/forward-am-ultracur3d-st-45-b.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ primary_color:
color_rgba: '#595959ff'
properties:
density: 1.12
viscosity_18c: 530
viscosity_25c: 312
viscosity_40c: 127
viscosity_60c: 51
8 changes: 4 additions & 4 deletions data/materials/liqcreate/liqcreate-composite-x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ primary_color:
properties:
density: 1.52
cure_wavelength: 405
viscosity_18c: 313
viscosity_25c: 196
viscosity_40c: 86
viscosity_60c: 39
viscosity_18c: 1784
viscosity_25c: 1223
viscosity_40c: 580
viscosity_60c: 276
2 changes: 1 addition & 1 deletion data/materials/liqcreate/liqcreate-strong-x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 538
viscosity_25c: 278
viscosity_40c: 92
viscosity_60c: 1
viscosity_60c: 32
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ properties:
density: 1.0
hardness_shore_a: 80
cure_wavelength: 405
viscosity_18c: 255
viscosity_25c: 148
viscosity_40c: 58
viscosity_60c: 26
viscosity_18c: 254
viscosity_25c: 154
viscosity_40c: 64
viscosity_60c: 27
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ properties:
density: 1.0
hardness_shore_a: 80
cure_wavelength: 405
viscosity_18c: 255
viscosity_25c: 148
viscosity_40c: 58
viscosity_60c: 26
viscosity_18c: 254
viscosity_25c: 154
viscosity_40c: 64
viscosity_60c: 27
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ properties:
density: 1.0
hardness_shore_a: 80
cure_wavelength: 405
viscosity_18c: 255
viscosity_25c: 148
viscosity_40c: 58
viscosity_60c: 26
viscosity_18c: 254
viscosity_25c: 154
viscosity_40c: 64
viscosity_60c: 27
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 404
viscosity_25c: 234
viscosity_40c: 91
viscosity_60c: 1
viscosity_60c: 35
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ properties:
cure_wavelength: 405
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 68
viscosity_60c: 1
viscosity_40c: 66
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 2
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ properties:
viscosity_18c: 287
viscosity_25c: 167
viscosity_40c: 66
viscosity_60c: 1
viscosity_60c: 26
7 changes: 7 additions & 0 deletions data/wash-media/3d-basics/3d-basics-dpm-wash-solvent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
slug: 3d-basics-dpm-wash-solvent
uuid: 4c47e887-013c-4f4a-8857-88f06fe8183f
brand:
slug: 3d-basics
name: 3D Basics DPM Wash Solvent
density: 0.95
wash_capacity: 1000
7 changes: 7 additions & 0 deletions data/wash-media/henkel/henkel-loctite-3d-cleaner-c.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
slug: henkel-loctite-3d-cleaner-c
uuid: 53d4a8a3-d2dd-4e0b-b69e-051fcc33845b
brand:
slug: henkel
name: LOCTITE 3D Cleaner C
density: 0.96
wash_capacity: 1000
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
slug: prusament-resin-cleaner-dpm
uuid: 44949b6e-875d-443c-89ce-8973f3a93af3
brand:
slug: prusament-resin
name: Prusament Resin Cleaner DPM
density: 0.95
wash_capacity: 1000
11 changes: 9 additions & 2 deletions scripts/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
from typing import Any, Dict
import yaml

# libyaml parser when available: several times faster than the pure Python one
_LOADER = getattr(yaml, "CSafeLoader", yaml.SafeLoader)


class DatabaseLoader:
"""Loads entity data from YAML files"""
Expand All @@ -31,6 +34,10 @@ class DatabaseLoader:
'material_containers': {
'directory': 'data/material-containers',
'primary_key': 'slug',
},
'wash_media': {
'directory': 'data/wash-media',
'primary_key': 'slug',
'subdirectories_by_brand': True,
},
}
Expand All @@ -52,8 +59,8 @@ def load_schema(self) -> bool:
def load_yaml_file(self, path: Path) -> Any:
"""Load a YAML file"""
try:
with open(path, 'r') as f:
return yaml.safe_load(f)
with open(path, 'r', encoding='utf-8') as f:
return yaml.load(f, Loader=_LOADER)
except Exception as e:
self.errors.append(f"Failed to parse YAML {path}: {e}")
return None
Expand Down
Loading