Fixes (#3)

* fixes

Author: DerThorsten

README.md

@@ -3,6 +3,15 @@
 
 A driver to run python code in a wasm environment, almost like running vanilla python code.
 
+## Motivation
+
+Debugging, experimenting and testing python code from a dedicated conda environment 
+in browser environment is a complex process with a lot of (complicated) steps.
+
+* create the environment for emscripten 
+* pack the environemtn
+
+
 
 ## Examples
 

pyjs_code_runner/backend/browser_main/browser_main.py

@@ -37,7 +37,6 @@ def run(self):
             server,
             url,
         ):
-
             page_url = f"{url}/{browser_main_html}"
             ret = asyncio.run(self.playwright_run_in_main_thread(page_url=page_url))
             if ret != 0:

pyjs_code_runner/cli/app.py

@@ -1,3 +1,3 @@
 import typer
 
-app = typer.Typer()
+app = typer.Typer(pretty_exceptions_show_locals=False)

pyjs_code_runner/cli/run.py

@@ -94,6 +94,10 @@ def parse_mounts(mounts):
     help="""cache-directory, if env-cache-dir is not specified, the an `appdir` is used""",
 )
 
+cache_option = typer.Option(
+    True,
+    help="""use cache""",
+)
 
 port_option = typer.Option(
     None,
@@ -124,6 +128,7 @@ def browser_main(
     pyjs_dir: Optional[Path] = pyjs_dir_option,
     host_work_dir: Optional[Path] = host_work_dir_option,
     cache_dir: Optional[Path] = cache_dir_option,
+    cache: bool = cache_option,
     port: Optional[int] = port_option,
     headless: bool = headless_option,
     slow_mo: Optional[int] = slowmo_option,
@@ -138,6 +143,7 @@ def browser_main(
         pkg_file_filter=pkg_file_filter,
         pyjs_dir=pyjs_dir,
         cache_dir=cache_dir,
+        use_cache=cache,
         host_work_dir=host_work_dir,
         backend_kwargs=dict(port=port, headless=headless, slow_mo=slow_mo),
     )
@@ -154,6 +160,7 @@ def browser_worker(
     pyjs_dir: Optional[Path] = pyjs_dir_option,
     host_work_dir: Optional[Path] = host_work_dir_option,
     cache_dir: Optional[Path] = cache_dir_option,
+    cache: bool = cache_option,
     port: Optional[int] = port_option,
     headless: bool = headless_option,
     slow_mo: Optional[int] = slowmo_option,
@@ -168,6 +175,7 @@ def browser_worker(
         pkg_file_filter=pkg_file_filter,
         pyjs_dir=pyjs_dir,
         cache_dir=cache_dir,
+        use_cache=cache,
         host_work_dir=host_work_dir,
         backend_kwargs=dict(port=port, headless=headless, slow_mo=slow_mo),
     )
@@ -191,6 +199,7 @@ def node(
     pyjs_dir: Optional[Path] = pyjs_dir_option,
     host_work_dir: Optional[Path] = host_work_dir_option,
     cache_dir: Optional[Path] = cache_dir_option,
+    cache: bool = cache_option,
     node_binary: Optional[Path] = node_binary_option,
 ):
     run_script(
@@ -203,6 +212,7 @@ def node(
         pkg_file_filter=pkg_file_filter,
         pyjs_dir=pyjs_dir,
         cache_dir=cache_dir,
+        use_cache=cache,
         host_work_dir=host_work_dir,
         backend_kwargs=dict(node_binary=node_binary),
     )
@@ -219,13 +229,17 @@ def run_script(
     pyjs_dir,
     host_work_dir,
     cache_dir,
+    use_cache,
     backend_kwargs=None,
 ):
 
     if backend_kwargs is None:
         backend_kwargs = dict()
     mounts = parse_mounts(mounts)
-    cache_dir = get_cache_dir(cache_dir=cache_dir)
+    if use_cache:
+        cache_dir = get_cache_dir(cache_dir=cache_dir)
+    else:
+        cache_dir = None
     pkg_file_filter = get_file_filter(pkg_file_filter, cache_dir=cache_dir)
 
     run(
@@ -238,6 +252,7 @@ def run_script(
         pkg_file_filter=pkg_file_filter,
         pyjs_dir=pyjs_dir,
         cache_dir=cache_dir,
+        use_cache=use_cache,
         host_work_dir=host_work_dir,
         backend_kwargs=backend_kwargs,
     )

pyjs_code_runner/get_file_filter.py

@@ -8,11 +8,13 @@
 def get_file_filter(pkg_file_filter, cache_dir):
     if pkg_file_filter is None or len(pkg_file_filter) == 0:
 
-        path_in_cache = Path(cache_dir) / "empack_config.yaml"
-        if not path_in_cache.exists():
+        # empack now supports passing None
+        return None
+        # path_in_cache = Path(cache_dir) / "empack_config.yaml"
+        # if not path_in_cache.exists():
 
-            urllib.request.urlretrieve(EMPACK_FILE_FILTER_URL, path_in_cache)
-        return pkg_file_filter_from_yaml(path_in_cache)
+        #     urllib.request.urlretrieve(EMPACK_FILE_FILTER_URL, path_in_cache)
+        # return pkg_file_filter_from_yaml(path_in_cache)
 
     else:
         print(pkg_file_filter)

pyjs_code_runner/js/utils.js

@@ -21,7 +21,7 @@ globalThis.make_pyjs = make_pyjs
 
 function eval_main_script(pyjs, workdir, filename) {
     try{
-        pyjs.exec("import os")
+        pyjs.exec("import os;from os.path import exists")
         pyjs.exec(`os.chdir("${workdir}")`)
         pyjs.eval_file(filename);
         return 0;

pyjs_code_runner/run.py

@@ -2,6 +2,8 @@
 from .constants import EXPORT_NAME_SUFFIX
 from .js_global_object import js_global_object
 from .work_dir_context import work_dir_context
+from .get_cache_dir import get_cache_dir
+
 import tempfile
 from pathlib import Path
 from empack.file_packager import pack_directory, pack_file, split_pack_environment
@@ -88,19 +90,18 @@ def copy_pyjs(conda_env, backend_type, pyjs_dir, outdir):
         shutil.copyfile(source_dir / file, outdir / file)
 
 
-def pack_env(conda_env, backend_type, pkg_file_filter, cache_dir, outdir):
+def pack_env(conda_env, backend_type, pkg_file_filter, cache_dir, use_cache, outdir):
 
     outname = "packed_env"
     cache_folder_name = Path(
         conda_env_to_cache_name(conda_env, backend_type=backend_type)
     )
     folder_for_env = cache_dir / cache_folder_name
     file_to_probe = folder_for_env / f"{outname}.js"
-    if not file_to_probe.exists():
+    if (not file_to_probe.exists()) or (not use_cache):
         folder_for_env.mkdir(parents=True, exist_ok=True)
 
         export_name = f"{js_global_object(backend_type)}.{EXPORT_NAME_SUFFIX}"
-
         with work_dir_context(folder_for_env):
             split_pack_environment(
                 env_prefix=conda_env,
@@ -132,12 +133,18 @@ def run(
     async_main,
     mounts,
     work_dir,
-    pkg_file_filter,
-    pyjs_dir,
-    cache_dir,
-    host_work_dir,
-    backend_kwargs,
+    pkg_file_filter=None,
+    pyjs_dir=None,
+    cache_dir=None,
+    use_cache=False,
+    host_work_dir=None,
+    backend_kwargs=None,
 ):
+    if backend_kwargs is None:
+        backend_kwargs = dict()
+
+    if cache_dir is None:
+        cache_dir = get_cache_dir(cache_dir=None)
 
     # create a temporary host work directory
     with host_work_dir_context(host_work_dir) as host_work_dir:
@@ -156,6 +163,7 @@ def run(
             outdir=host_work_dir,
             pkg_file_filter=pkg_file_filter,
             cache_dir=cache_dir,
+            use_cache=use_cache,
         )
 
         # pack all the mounts