Add onComputeInitialized. Minor code cleanup. Closes #1818 (#1821)

deepforge-dev · Jul 29, 2020 · c4ea35d · c4ea35d
1 parent 79390c1
commit c4ea35d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/visualizers/widgets/InteractiveEditor/InteractiveEditorWidget.js b/src/visualizers/widgets/InteractiveEditor/InteractiveEditorWidget.js
@@ -28,12 +28,13 @@ define([
             overlay.on('click', async () => {
                 const {id, config} = await this.promptComputeConfig();
                 try {
-                    await this.createInteractiveSession(id, config);
+                    this.session = await this.createInteractiveSession(id, config);
                     const features = this.getCapabilities();
                     if (features.save) {
                         DeepForge.registerAction('Save', 'save', 10, () => this.save());
                     }
                     overlay.remove();
+                    this.onComputeInitialized(this.session);
                 } catch (err) {
                     const title = 'Compute Creation Error';
                     const body = 'Unable to create compute. Please verify the credentials are correct.';
@@ -44,6 +45,9 @@ define([
             });
         }
 
+        onComputeInitialized(/*session*/) {
+        }
+
         getCapabilities() {
             return {
                 suspend: this.isOveridden('getEditorState') &&
@@ -91,7 +95,7 @@ define([
         }
 
         async createInteractiveSession(computeId, config) {
-            this.session = await Session.new(computeId, config);
+            return await Session.new(computeId, config);
         }
 
         destroy() {
@@ -103,6 +107,15 @@ define([
 
         updateNode(/*desc*/) {
         }
+
+        onActivate() {
+        }
+
+        onDeactivate() {
+        }
+
+        onWidgetContainerResize(/*width, height*/) {
+        }
     }
 
     return InteractiveEditorWidget;

diff --git a/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js b/src/visualizers/widgets/TensorPlotter/TensorPlotterWidget.js
@@ -64,9 +64,10 @@ define([
         }
 
         async createInteractiveSession(computeId, config) {
-            this.session = await Session.new(computeId, config);
-            this.initSession();
-            this.artifactLoader.session = this.session;
+            const session = await Session.new(computeId, config);
+            this.initSession(session);
+            this.artifactLoader.session = session;
+            return session;
         }
 
         async getAuthenticationConfig (dataInfo) {
@@ -85,11 +86,11 @@ define([
             }
         }
 
-        async initSession () {
-            await this.session.whenConnected();
+        async initSession (session) {
+            await session.whenConnected();
             const initCode = await this.getInitializationCode();
-            await this.session.addFile('utils/init.py', initCode);
-            await this.session.addFile('utils/explorer_helpers.py', HELPERS_PY);
+            await session.addFile('utils/init.py', initCode);
+            await session.addFile('utils/explorer_helpers.py', HELPERS_PY);
         }
 
         async execPy(code) {