Skip to content

Commit bd0b405

Browse files
committed
update: fix default importing from folder
1 parent 4fddcae commit bd0b405

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

utils/jupyterlite.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ async def install_setup():
1818
await micropip.install("mat3ra-utils")
1919

2020

21-
UPLOADS_FOLDER = "uploads"
22-
23-
2421
class EnvironmentEnum(Enum):
2522
PYODIDE = "pyodide"
2623
PYTHON = "python"
@@ -39,9 +36,13 @@ class SeverityLevelEnum(Enum):
3936
if ENVIRONMENT == EnvironmentEnum.PYODIDE:
4037
import micropip
4138

39+
UPLOADS_FOLDER = "/drive/made/uploads"
40+
4241
if ENVIRONMENT == EnvironmentEnum.PYTHON:
4342
import subprocess
4443

44+
UPLOADS_FOLDER = "./uploads"
45+
4546

4647
def log(message: str, level: Optional[SeverityLevelEnum] = None, force_verbose: Optional[bool] = None):
4748
"""
@@ -257,8 +258,13 @@ def get_data_python(key: str, globals_dict: Optional[Dict] = None):
257258
log(f"{index}: {name}")
258259
index += 1
259260
data_from_host.append(data)
261+
print("added material")
260262
if globals_dict is not None:
261263
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
262268
except FileNotFoundError:
263269
print("No data found in the 'uploads' folder.")
264270

@@ -307,8 +313,7 @@ def get_materials(globals_dict: Optional[Dict] = None) -> List[Any]:
307313
else:
308314
# Fallback to load materials from the UPLOADS_FOLDER if launched outside of Materials Designer
309315
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)
312317

313318

314319
def set_materials(materials: List[Any]):
@@ -354,6 +359,7 @@ def load_materials_from_folder(folder_path: Optional[str] = None, verbose: bool
354359
data = json.load(file)
355360
name = os.path.splitext(filename)[0]
356361
log(f"{index}: {name}", SeverityLevelEnum.INFO, force_verbose=verbose)
362+
print("-----")
357363
index += 1
358364
data_from_host.append(data)
359365
except FileNotFoundError:

0 commit comments

Comments
 (0)