@@ -142,7 +142,7 @@ def get_materials(globals_dict: Optional[Dict] = None) -> List[Any]:
142
142
get_data ("materials_in" , globals_dict )
143
143
144
144
if "materials_in" in globals_dict and globals_dict ["materials_in" ]:
145
- materials = [Material (item ) for item in globals_dict ["materials_in" ]]
145
+ materials = [Material . create (item ) for item in globals_dict ["materials_in" ]]
146
146
log (f"Retrieved { len (materials )} materials." )
147
147
return materials
148
148
else :
@@ -161,7 +161,7 @@ def set_materials(materials: List[Any]):
161
161
from mat3ra .utils .array import convert_to_array_if_not
162
162
163
163
materials = convert_to_array_if_not (materials )
164
- materials_data = [material .to_json () for material in materials ]
164
+ materials_data = [json . loads ( material .to_json () ) for material in materials ]
165
165
set_data ("materials" , materials_data )
166
166
167
167
@@ -200,7 +200,7 @@ def load_materials_from_folder(folder_path: Optional[str] = None, verbose: bool
200
200
log (f"No data found in the '{ folder_path } ' folder." , SeverityLevelEnum .ERROR , force_verbose = verbose )
201
201
return []
202
202
203
- materials = [Material (item ) for item in data_from_host ]
203
+ materials = [Material . create (item ) for item in data_from_host ]
204
204
205
205
if materials :
206
206
log (
@@ -269,7 +269,7 @@ def write_materials_to_folder(materials: List[Any], folder_path: Optional[str] =
269
269
safe_name = material .name .replace ("%" , "pct" ).replace ("/" , ":" )
270
270
file_path = os .path .join (folder_path , f"{ safe_name } .json" )
271
271
with open (file_path , "w" ) as file :
272
- json .dump (material .to_json (), file )
272
+ json .dump (material .to_dict (), file )
273
273
log (f"Material '{ material .name } ' written to '{ file_path } '" , SeverityLevelEnum .INFO , force_verbose = verbose )
274
274
275
275
0 commit comments