From 9d81b1aa1da6c582313a831c5c7fe1e795463737 Mon Sep 17 00:00:00 2001 From: Duygu Hasan Date: Thu, 22 Dec 2022 13:54:50 +0200 Subject: [PATCH 1/4] Remove unneeded line --- .../vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py index b2d08b75e7..63f6d6ec1a 100644 --- a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py +++ b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py @@ -36,6 +36,5 @@ def run_job(path, arguments=None): process = subprocess.Popen( cmd, stdout=log_file, stderr=log_file, env=os.environ.copy() ) - subprocess.check_output(["/bin/ls", "-l"]) process.wait() return f"{process.returncode}" From 305da02ac13888f9f769c3bd9b5a044c08211a9d Mon Sep 17 00:00:00 2001 From: Duygu Hasan Date: Thu, 22 Dec 2022 14:00:43 +0200 Subject: [PATCH 2/4] Some changes on subprocess call --- .../vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py index 63f6d6ec1a..89410c5f86 100644 --- a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py +++ b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py @@ -34,7 +34,7 @@ def run_job(path, arguments=None): ) cmd = shlex.split(cmd_str) process = subprocess.Popen( - cmd, stdout=log_file, stderr=log_file, env=os.environ.copy() + cmd, stdout=log_file, stderr=log_file, env=os.environ.copy(), shell=False ) process.wait() return f"{process.returncode}" From 4814c06b0bde3c9f2b6d3a6d3c424c2ef546319d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:06:17 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../vdk-jupyterlab-extension/vdk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py index 89410c5f86..9e46f02e2b 100644 --- a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py +++ b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py @@ -34,7 +34,11 @@ def run_job(path, arguments=None): ) cmd = shlex.split(cmd_str) process = subprocess.Popen( - cmd, stdout=log_file, stderr=log_file, env=os.environ.copy(), shell=False + cmd, + stdout=log_file, + stderr=log_file, + env=os.environ.copy(), + shell=False, ) process.wait() return f"{process.returncode}" From 15aca53d199dfe7e8d5649042506128abb81694c Mon Sep 17 00:00:00 2001 From: Duygu Hasan Date: Tue, 3 Jan 2023 16:09:46 +0200 Subject: [PATCH 4/4] Add cmd list manually instead of spliting a string --- .../vdk-jupyterlab-extension/vdk.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py index 9e46f02e2b..2bffc33d06 100644 --- a/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py +++ b/projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk-jupyterlab-extension/vdk.py @@ -26,13 +26,11 @@ def run_job(path, arguments=None): return "Incorrect path!" with open("vdk_logs.txt", "w+") as log_file: path = shlex.quote(path) - arguments = shlex.quote(arguments) - cmd_str = ( - f"vdk run {path}" - if not arguments - else f"vdk run {path} --arguments {arguments}" - ) - cmd = shlex.split(cmd_str) + cmd: list[str] = ["vdk", "run", f"{path}"] + if arguments: + arguments = shlex.quote(arguments) + cmd.append("--arguments") + cmd.append(f"{arguments}") process = subprocess.Popen( cmd, stdout=log_file,