Dbg r reload

dash/testing/application_runners.py

@@ -5,7 +5,9 @@
 import uuid
 import shlex
 import threading
+import shutil
 import subprocess
+import distutils
 import logging
 import inspect
 
@@ -210,9 +212,7 @@ def start(
                 args, stdout=subprocess.PIPE, stderr=subprocess.PIPE
             )
             # wait until server is able to answer http request
-            wait.until(
-                lambda: self.accessible(self.url), timeout=start_timeout
-            )
+            wait.until(lambda: self.accessible(self.url), timeout=start_timeout)
 
         except (OSError, ValueError):
             logger.exception("process server has encountered an error")
@@ -255,19 +255,18 @@ def start(self, app, start_timeout=2, cwd=None):
         """Start the server with subprocess and Rscript."""
 
         # app is a R string chunk
-        if (os.path.isfile(app) and os.path.exists(app)):
+        if os.path.isfile(app) and os.path.exists(app):
             # app is already a file in a dir - use that as cwd
             if not cwd:
                 cwd = os.path.dirname(app)
                 logger.info("RRunner inferred cwd from app path: %s", cwd)
         else:
-            path = (
-                "/tmp/app_{}.R".format(uuid.uuid4().hex)
-                if not self.is_windows
-                else os.path.join(
-                    (os.getenv("TEMP"), "app_{}.R".format(uuid.uuid4().hex))
-                )
+            tmp = os.path.join(
+                "/tmp" if not self.is_windows else os.getenv("TEMP"),
+                uuid.uuid4().hex,
             )
+            path = os.path.join(tmp, "app.R")
+
             logger.info("RRunner start => app is R code chunk")
             logger.info("make a temporary R file for execution => %s", path)
             logger.debug("content of the dashR app")
@@ -283,11 +282,11 @@ def start(self, app, start_timeout=2, cwd=None):
                 for entry in inspect.stack():
                     if "/dash/testing/" not in entry[1].replace("\\", "/"):
                         cwd = os.path.dirname(os.path.realpath(entry[1]))
+                        logger.warning("get cwd from inspect => %s", cwd)
                         break
             if cwd:
                 logger.info(
-                    "RRunner inferred cwd from the Python call stack: %s",
-                    cwd
+                    "RRunner inferred cwd from the Python call stack: %s", cwd
                 )
             else:
                 logger.warning(
@@ -297,9 +296,28 @@ def start(self, app, start_timeout=2, cwd=None):
                     "dashr.run_server(app, cwd=os.path.dirname(__file__))"
                 )
 
+            # try copying all valid sub folders (i.e. assets) in cwd to tmp
+            # note that the R assets folder name can be any valid folder name
+            assets = [
+                os.path.join(cwd, _)
+                for _ in os.listdir(cwd)
+                if not _.startswith("__")
+                and os.path.isdir(os.path.join(cwd, _))
+            ]
+
+            for asset in assets:
+                target = os.path.join(tmp, os.path.basename(asset))
+                if os.path.exists(target):
+                    logger.debug("delete existing target %s", target)
+                    shutil.rmtree(target)
+                logger.debug("copying %s => %s", asset, tmp)
+                distutils.dir_util.copy_tree(asset, target)
+                logger.debug("copied with %s", os.listdir(target))
+
         logger.info("Run dashR app with Rscript => %s", app)
+
         args = shlex.split(
-            "Rscript {}".format(os.path.realpath(app)),
+            "Rscript -e 'source(\"{}\")'".format(os.path.realpath(app)),
             posix=not self.is_windows,
         )
         logger.debug("start dash process with %s", args)
@@ -309,13 +327,13 @@ def start(self, app, start_timeout=2, cwd=None):
                 args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd
             )
             # wait until server is able to answer http request
-            wait.until(
-                lambda: self.accessible(self.url), timeout=start_timeout
-            )
+            wait.until(lambda: self.accessible(self.url), timeout=start_timeout)
 
         except (OSError, ValueError):
             logger.exception("process server has encountered an error")
             self.started = False
             return
 
         self.started = True
+
+        return app