Skip to content

add mounts to empack packed environment #14

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
merged 3 commits into from
Mar 11, 2024
Merged

add mounts to empack packed environment #14

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
3e88d1b
add mounts to empack packed environment
DerThorsten Mar 8, 2024
d5a4779
try catch arround empack
DerThorsten Mar 11, 2024
ec297c0
use mounts
DerThorsten Mar 11, 2024
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
6 changes: 0 additions & 6 deletions pyjs_code_runner/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ async function make_pyjs(print, error) {
".", /* package_tarballs_root_url */
false /* verbose */
);

await fetchMounts(pyjs);
//await Promise.all([promise_env, promise_mount]);

//await pyjs.init()

globalThis.pyjs = pyjs
return pyjs
}
Expand Down
19 changes: 16 additions & 3 deletions pyjs_code_runner/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import tempfile
from pathlib import Path
from empack.pack import pack_env, pack_directory
from empack.pack import pack_env, pack_directory,add_tarfile_to_env_meta
from empack.pack import DEFAULT_CONFIG_PATH as EMPACK_DEFAULT_CONFIG_PATH
from empack.file_patterns import pkg_file_filter_from_yaml

Expand Down Expand Up @@ -36,6 +36,7 @@ def pack_mounts(mounts, host_work_dir, backend_type):
)
with open(Path(host_work_dir) / "mounts.json", "w") as f:
json.dump(mount_js_files, f, indent=4)
return mount_js_files


def conda_env_to_cache_name(conda_env, backend_type):
Expand Down Expand Up @@ -124,14 +125,26 @@ def run(
cache_dir=cache_dir,
outdir=host_work_dir,
compresslevel=9,
)
)
env_meta_filename = Path(host_work_dir) / "empack_env_meta.json"



#raise RuntimeError("stop here")
# pack all the mounts
pack_mounts(
mount_files = pack_mounts(
mounts=mounts,
backend_type=backend_type,
host_work_dir=host_work_dir,
)
for mount_file in mount_files:
print(f"mount_file: {mount_file}")
try:
add_tarfile_to_env_meta(
env_meta_filename=env_meta_filename, tarfile=mount_file
)
except shutil.SameFileError:
pass

# get the backend where the wasm code runs (ie node/browser-main/browser-worker)
backend = get_backend_cls(backend_type=backend_type)(
Expand Down