@@ -18,9 +18,6 @@ async def install_setup():
18
18
await micropip .install ("mat3ra-utils" )
19
19
20
20
21
- UPLOADS_FOLDER = "uploads"
22
-
23
-
24
21
class EnvironmentEnum (Enum ):
25
22
PYODIDE = "pyodide"
26
23
PYTHON = "python"
@@ -39,9 +36,13 @@ class SeverityLevelEnum(Enum):
39
36
if ENVIRONMENT == EnvironmentEnum .PYODIDE :
40
37
import micropip
41
38
39
+ UPLOADS_FOLDER = "/drive/made/uploads"
40
+
42
41
if ENVIRONMENT == EnvironmentEnum .PYTHON :
43
42
import subprocess
44
43
44
+ UPLOADS_FOLDER = "./uploads"
45
+
45
46
46
47
def log (message : str , level : Optional [SeverityLevelEnum ] = None , force_verbose : Optional [bool ] = None ):
47
48
"""
@@ -257,8 +258,13 @@ def get_data_python(key: str, globals_dict: Optional[Dict] = None):
257
258
log (f"{ index } : { name } " )
258
259
index += 1
259
260
data_from_host .append (data )
261
+ print ("added material" )
260
262
if globals_dict is not None :
261
263
globals_dict [key ] = data_from_host
264
+ print ("globals dict is not None" )
265
+ else :
266
+ print ("globals dict is None" )
267
+ return data_from_host
262
268
except FileNotFoundError :
263
269
print ("No data found in the 'uploads' folder." )
264
270
@@ -307,8 +313,7 @@ def get_materials(globals_dict: Optional[Dict] = None) -> List[Any]:
307
313
else :
308
314
# Fallback to load materials from the UPLOADS_FOLDER if launched outside of Materials Designer
309
315
log (f"No input materials found. Loading from the { UPLOADS_FOLDER } folder." )
310
- get_data_python ("materials_in" , globals_dict )
311
- return []
316
+ return get_data_python ("materials_in" , globals_dict )
312
317
313
318
314
319
def set_materials (materials : List [Any ]):
@@ -354,6 +359,7 @@ def load_materials_from_folder(folder_path: Optional[str] = None, verbose: bool
354
359
data = json .load (file )
355
360
name = os .path .splitext (filename )[0 ]
356
361
log (f"{ index } : { name } " , SeverityLevelEnum .INFO , force_verbose = verbose )
362
+ print ("-----" )
357
363
index += 1
358
364
data_from_host .append (data )
359
365
except FileNotFoundError :
0 commit comments