From 0c405b743e4bc5aa4acbebff9d3f2aeb17c44398 Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Thu, 6 Aug 2020 09:40:18 -0500 Subject: [PATCH 1/2] Ensure not clobbering same file. Fixes #1842 --- .../widgets/TensorPlotter/TensorPlotterWidget.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js b/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js index 2a4007a08..f6a2953c0 100644 --- a/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js +++ b/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js @@ -30,6 +30,7 @@ define([ constructor(logger, container) { super(container); this._logger = logger.fork('Widget'); + this.cmdCount = 0; this.currentPlotData = null; this.session = null; @@ -95,8 +96,10 @@ define([ async execPy(code) { try { - await this.session.addFile('last_cmd.py', code); - const {stdout} = await this.session.exec('python last_cmd.py'); + const i = ++this.cmdCount; + await this.session.addFile(`cmd_${i}.py`, code); + const {stdout} = await this.session.exec(`python cmd_${i}.py`); + // TODO: Remove file return stdout; } catch (err) { const {stderr} = err.jobResult; From f86c3ec0c1d4739772871cee7a7d4c9320197c1b Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Thu, 6 Aug 2020 12:04:36 -0500 Subject: [PATCH 2/2] Remove command file after execution --- src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js b/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js index f6a2953c0..ac4261f87 100644 --- a/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js +++ b/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js @@ -99,7 +99,7 @@ define([ const i = ++this.cmdCount; await this.session.addFile(`cmd_${i}.py`, code); const {stdout} = await this.session.exec(`python cmd_${i}.py`); - // TODO: Remove file + await this.session.removeFile(`cmd_${i}.py`); return stdout; } catch (err) { const {stderr} = err.jobResult;