For now do not update the datascience code to use internal.scripts.vscode_datascience_helpers.*.

ericsnowcurrently · ericsnowcurrently · commit a707a3575ff7 · 2020-04-07T09:48:49.000-06:00
diff --git a/src/client/datascience/jupyter/interpreter/jupyterCommand.ts b/src/client/datascience/jupyter/interpreter/jupyterCommand.ts
@@ -3,8 +3,8 @@
 'use strict';
 import { SpawnOptions } from 'child_process';
 import { inject, injectable } from 'inversify';
+import * as path from 'path';
 import { traceError } from '../../../common/logger';
-import { scripts as internalScripts } from '../../../common/process/internal';
 import {
     ExecutionResult,
     IProcessService,
@@ -13,6 +13,7 @@ import {
     IPythonExecutionService,
     ObservableExecutionResult
 } from '../../../common/process/types';
+import { EXTENSION_ROOT_DIR } from '../../../constants';
 import { IEnvironmentActivationService } from '../../../interpreter/activation/types';
 import { IInterpreterService, PythonInterpreter } from '../../../interpreter/contracts';
 import { JupyterCommands, PythonDaemonModule } from '../../constants';
@@ -97,10 +98,19 @@ class InterpreterJupyterCommand implements IJupyterCommand {
                         args.join(' ').toLowerCase().startsWith('-m jupyter notebook')) ||
                     (moduleName.toLowerCase() === 'notebook' && args.join(' ').toLowerCase().startsWith('-m notebook'))
                 ) {
-                    const [scriptArgs, parse] = internalScripts.vscode_datascience_helpers.jupyter_nbInstalled();
                     try {
-                        const proc = await svc.exec(scriptArgs, {});
-                        if (parse(proc.stdout)) {
+                        const output = await svc.exec(
+                            [
+                                path.join(
+                                    EXTENSION_ROOT_DIR,
+                                    'pythonFiles',
+                                    'vscode_datascience_helpers',
+                                    'jupyter_nbInstalled.py'
+                                )
+                            ],
+                            {}
+                        );
+                        if (output.stdout.toLowerCase().includes('available')) {
                             return svc;
                         }
                     } catch (ex) {
@@ -253,17 +263,28 @@ export class InterpreterJupyterKernelSpecCommand extends InterpreterJupyterComma
             interpreter,
             bypassCondaExecution: true
         });
-        const args = internalScripts.vscode_datascience_helpers.getJupyterKernels();
-        return activatedEnv.exec(args, { ...options, throwOnStdErr: true });
+        return activatedEnv.exec(
+            [path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'vscode_datascience_helpers', 'getJupyterKernels.py')],
+            { ...options, throwOnStdErr: true }
+        );
     }
     private async getKernelSpecVersion(interpreter: PythonInterpreter, options: SpawnOptions) {
         // Try getting kernels using python script, if that fails (even if there's output in stderr) rethrow original exception.
         const activatedEnv = await this.pythonExecutionFactory.createActivatedEnvironment({
             interpreter,
             bypassCondaExecution: true
         });
-        const args = internalScripts.vscode_datascience_helpers.getJupyterKernelspecVersion();
-        return activatedEnv.exec(args, { ...options, throwOnStdErr: true });
+        return activatedEnv.exec(
+            [
+                path.join(
+                    EXTENSION_ROOT_DIR,
+                    'pythonFiles',
+                    'vscode_datascience_helpers',
+                    'getJupyterKernelspecVersion.py'
+                )
+            ],
+            { ...options, throwOnStdErr: true }
+        );
     }
 }
 
diff --git a/src/client/datascience/jupyter/interpreter/jupyterCommandInterpreterExecutionService.ts b/src/client/datascience/jupyter/interpreter/jupyterCommandInterpreterExecutionService.ts
@@ -4,14 +4,15 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
+import * as path from 'path';
 import { CancellationToken } from 'vscode';
 import { Cancellation } from '../../../common/cancellation';
 import { traceError, traceInfo, traceWarning } from '../../../common/logger';
 import { IFileSystem } from '../../../common/platform/types';
-import { scripts as internalScripts } from '../../../common/process/internal';
 import { IPythonExecutionFactory, ObservableExecutionResult, SpawnOptions } from '../../../common/process/types';
 import { DataScience } from '../../../common/utils/localize';
 import { noop } from '../../../common/utils/misc';
+import { EXTENSION_ROOT_DIR } from '../../../constants';
 import { IInterpreterService, PythonInterpreter } from '../../../interpreter/contracts';
 import { JupyterCommands, PythonDaemonModule } from '../../constants';
 import { IJupyterSubCommandExecutionService } from '../../types';
@@ -101,13 +102,13 @@ export class JupyterCommandFinderInterpreterExecutionService implements IJupyter
 
         // We have a small python file here that we will execute to get the server info from all running Jupyter instances
         const newOptions: SpawnOptions = { mergeStdOutErr: true, token: token };
-        const [args, parse] = internalScripts.vscode_datascience_helpers.getServerInfo();
-        const serverInfoProc = await daemon.exec(args, newOptions);
+        const file = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'vscode_datascience_helpers', 'getServerInfo.py');
+        const serverInfoString = await daemon.exec([file], newOptions);
 
         let serverInfos: JupyterServerInfo[];
         try {
             // Parse out our results, return undefined if we can't suss it out
-            serverInfos = parse(serverInfoProc.stdout) as JupyterServerInfo[];
+            serverInfos = JSON.parse(serverInfoString.stdout.trim()) as JupyterServerInfo[];
         } catch (err) {
             traceWarning('Failed to parse JSON when getting server info out from getServerInfo.py', err);
             return;
diff --git a/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts b/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts
@@ -4,15 +4,16 @@
 'use strict';
 
 import { inject, injectable, named } from 'inversify';
+import * as path from 'path';
 import { CancellationToken } from 'vscode';
 import { Cancellation } from '../../../common/cancellation';
 import { traceError, traceInfo, traceWarning } from '../../../common/logger';
 import { IFileSystem } from '../../../common/platform/types';
-import { scripts as internalScripts } from '../../../common/process/internal';
 import { IPythonExecutionFactory, ObservableExecutionResult, SpawnOptions } from '../../../common/process/types';
 import { IOutputChannel, IPathUtils, Product } from '../../../common/types';
 import { DataScience } from '../../../common/utils/localize';
 import { noop } from '../../../common/utils/misc';
+import { EXTENSION_ROOT_DIR } from '../../../constants';
 import { IInterpreterService, PythonInterpreter } from '../../../interpreter/contracts';
 import { sendTelemetryEvent } from '../../../telemetry';
 import { JUPYTER_OUTPUT_CHANNEL, PythonDaemonModule, Telemetry } from '../../constants';
@@ -125,13 +126,13 @@ export class JupyterInterpreterSubCommandExecutionService
 
         // We have a small python file here that we will execute to get the server info from all running Jupyter instances
         const newOptions: SpawnOptions = { mergeStdOutErr: true, token: token };
-        const [args, parse] = internalScripts.vscode_datascience_helpers.getServerInfo();
-        const serverInfoProc = await daemon.exec(args, newOptions);
+        const file = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'vscode_datascience_helpers', 'getServerInfo.py');
+        const serverInfoString = await daemon.exec([file], newOptions);
 
         let serverInfos: JupyterServerInfo[];
         try {
             // Parse out our results, return undefined if we can't suss it out
-            serverInfos = parse(serverInfoProc.stdout) as JupyterServerInfo[];
+            serverInfos = JSON.parse(serverInfoString.stdout.trim()) as JupyterServerInfo[];
         } catch (err) {
             traceWarning('Failed to parse JSON when getting server info out from getServerInfo.py', err);
             return;
@@ -196,9 +197,18 @@ export class JupyterInterpreterSubCommandExecutionService
                     return '';
                 });
             // Possible we cannot import ipykernel for some reason. (use as backup option).
-            const args = internalScripts.vscode_datascience_helpers.getJupyterKernels();
             const stdoutFromFileExecPromise = daemon
-                .exec(args, spawnOptions)
+                .exec(
+                    [
+                        path.join(
+                            EXTENSION_ROOT_DIR,
+                            'pythonFiles',
+                            'vscode_datascience_helpers',
+                            'getJupyterKernels.py'
+                        )
+                    ],
+                    spawnOptions
+                )
                 .then((output) => output.stdout)
                 .catch((fileEx) => {
                     traceError('Failed to list kernels from getJupyterKernels.py', fileEx);
diff --git a/src/client/datascience/jupyter/jupyterVariables.ts b/src/client/datascience/jupyter/jupyterVariables.ts
@@ -4,16 +4,17 @@
 import { nbformat } from '@jupyterlab/coreutils';
 import { JSONObject } from '@phosphor/coreutils';
 import { inject, injectable } from 'inversify';
+import * as path from 'path';
 import stripAnsi from 'strip-ansi';
 import * as uuid from 'uuid/v4';
 
 import { Uri } from 'vscode';
 import { PYTHON_LANGUAGE } from '../../common/constants';
 import { traceError } from '../../common/logger';
 import { IFileSystem } from '../../common/platform/types';
-import { scripts as internalScripts } from '../../common/process/internal';
 import { IConfigurationService } from '../../common/types';
 import * as localize from '../../common/utils/localize';
+import { EXTENSION_ROOT_DIR } from '../../constants';
 import { Identifiers, Settings } from '../constants';
 import {
     ICell,
@@ -93,12 +94,20 @@ export class JupyterVariables implements IJupyterVariables {
     // Private methods
     // Load our python files for fetching variables
     private async loadVariableFiles(): Promise<void> {
-        let args = internalScripts.vscode_datascience_helpers.getJupyterVariableDataFrameInfo();
-        let file = args[0];
+        let file = path.join(
+            EXTENSION_ROOT_DIR,
+            'pythonFiles',
+            'vscode_datascience_helpers',
+            'getJupyterVariableDataFrameInfo.py'
+        );
         this.fetchDataFrameInfoScript = await this.fileSystem.readFile(file);
 
-        args = internalScripts.vscode_datascience_helpers.getJupyterVariableDataFrameInfo();
-        file = args[0];
+        file = path.join(
+            EXTENSION_ROOT_DIR,
+            'pythonFiles',
+            'vscode_datascience_helpers',
+            'getJupyterVariableDataFrameRows.py'
+        );
         this.fetchDataFrameRowsScript = await this.fileSystem.readFile(file);
 
         this.filesLoaded = true;
