Regular code building

Author: rchiodo

src/client/datascience/constants.ts

@@ -173,12 +173,9 @@ export namespace LiveShare {
 }
 
 export namespace LiveShareCommands {
- export const isNotebookSupported = 'isNotebookSupported';
- export const isImportSupported = 'isImportSupported';
- export const isKernelCreateSupported = 'isKernelCreateSupported';
- export const isKernelSpecSupported = 'isKernelSpecSupported';
  export const connectToNotebookServer = 'connectToNotebookServer';
  export const getUsableJupyterPython = 'getUsableJupyterPython';
+ export const enumerateVersions = 'enumerateVersions';
  export const executeObservable = 'executeObservable';
  export const getSysInfo = 'getSysInfo';
  export const serverResponse = 'serverResponse';

src/client/datascience/history/history.ts

@@ -51,6 +51,7 @@ import {
  IJupyterVariable,
  IJupyterVariables,
  IJupyterVariablesResponse,
+ IJupyterVersionCache,
  IMessageCell,
  INotebookExporter,
  INotebookImporter,
@@ -61,7 +62,6 @@ import {
 } from '../types';
 import { WebViewHost } from '../webViewHost';
 import { HistoryMessageListener } from './historyMessageListener';
-import { IJupyterVersionCache } from '../types';
 import {
  HistoryMessages,
  IAddedSysInfo,
@@ -1007,7 +1007,7 @@ export class History extends WebViewHost<IHistoryMapping> implements IHistory {
  const knownDark = await this.isDark();
 
  // Extract our options
- const options = await this.historyProvider.getNotebookOptions(resource);
+ const options = await this.historyProvider.getNotebookOptions();
 
  this.logger.logInformation('Connecting to jupyter server ...');
 

src/client/datascience/history/historyProvider.ts

@@ -81,7 +81,7 @@ export class HistoryProvider implements IHistoryProvider, IAsyncDisposable {
  throw new Error(localize.DataScience.pythonInteractiveCreateFailed());
  }
 
- public async getNotebookOptions() : Promise<INotebookServerOptions> {
+ public async getNotebookOptions(resource: Uri | undefined) : Promise<INotebookServerOptions> {
  // Find the settings that we are going to launch our server with
  const settings = this.configService.getSettings();
  let serverURI: string | undefined = settings.datascience.jupyterServerURI;
@@ -93,6 +93,7 @@ export class HistoryProvider implements IHistoryProvider, IAsyncDisposable {
  }
 
  return {
+ resource,
  uri: serverURI,
  useDefaultConfig,
  purpose: Identifiers.HistoryPurpose

src/client/datascience/history/historycommandlistener.ts

@@ -240,7 +240,7 @@ export class HistoryCommandListener implements IDataScienceCommandListener {
  // create a brand new one.
  const version = await this.jupyterVersionCache.get(Uri.file(input));
  if (version) {
- server = await this.jupyterExecution.connectToNotebookServer(version, { useDefaultConfig, purpose: uuid() }, cancelToken);
+ server = await this.jupyterExecution.connectToNotebookServer(version, { resource: Uri.file(input), useDefaultConfig, purpose: uuid() }, cancelToken);
 
  // If that works, then execute all of the cells.
  const cells = Array.prototype.concat(... await Promise.all(ranges.map(r => {

src/client/datascience/jupyter/jupyterCommand.ts

@@ -2,10 +2,8 @@
 // Licensed under the MIT License.
 'use strict';
 import { inject, injectable } from 'inversify';
-import { CancellationToken, Uri } from 'vscode';
-import * as fs from 'fs-extra';
-import * as os from 'os';
 import * as path from 'path';
+import { CancellationToken, Uri } from 'vscode';
 
 import { Cancellation } from '../../../client/common/cancellation';
 import { IWorkspaceService } from '../../common/application/types';
@@ -20,12 +18,11 @@ import {
  ObservableExecutionResult,
  SpawnOptions
 } from '../../common/process/types';
-import { IConfigurationService, IDisposableRegistry, IDisposable } from '../../common/types';
+import { IConfigurationService, IDisposable, IDisposableRegistry } from '../../common/types';
 import { IEnvironmentActivationService } from '../../interpreter/activation/types';
 import { IInterpreterService, IKnownSearchPathsForInterpreters, PythonInterpreter } from '../../interpreter/contracts';
 import { JupyterCommands, RegExpValues } from '../constants';
 import { IJupyterCommand, IJupyterCommandFactory } from '../types';
-import { string } from 'prop-types';
 
 // JupyterCommand objects represent some process that can be launched that should be guaranteed to work because it
 // was found by testing it previously
@@ -249,7 +246,6 @@ export class JupyterCommandFactory implements IJupyterCommandFactory, IDisposabl
  return `${command}:${interpreter.path}:${interpreter.displayName ? interpreter.displayName : interpreter.envName}`;
  }
 
-
  private supportsSearchingForCommands(): boolean {
  if (this.configuration) {
  const settings = this.configuration.getSettings();

src/client/datascience/jupyter/jupyterConnection.ts

@@ -5,7 +5,7 @@ import '../../common/extensions';
 
 import { ChildProcess } from 'child_process';
 import * as path from 'path';
-import { CancellationToken, Disposable, Event, EventEmitter, Uri } from 'vscode';
+import { CancellationToken, Disposable, Event, EventEmitter } from 'vscode';
 
 import { CancellationError } from '../../common/cancellation';
 import { IFileSystem } from '../../common/platform/types';

src/client/datascience/jupyter/jupyterExecution.ts

@@ -12,9 +12,9 @@ import { CancellationToken, Event, EventEmitter, Uri } from 'vscode';
 
 import { ILiveShareApi, IWorkspaceService } from '../../common/application/types';
 import { Cancellation, CancellationError } from '../../common/cancellation';
-import { traceInfo, traceWarning } from '../../common/logger';
+import { traceInfo } from '../../common/logger';
 import { IFileSystem, TemporaryDirectory } from '../../common/platform/types';
-import { IProcessService, IProcessServiceFactory, IPythonExecutionFactory, SpawnOptions } from '../../common/process/types';
+import { IProcessServiceFactory, IPythonExecutionFactory, SpawnOptions } from '../../common/process/types';
 import { IAsyncDisposableRegistry, IConfigurationService, IDisposableRegistry, ILogger } from '../../common/types';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
@@ -25,7 +25,6 @@ import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
 import { JupyterCommands, RegExpValues, Telemetry } from '../constants';
 import {
  IConnection,
- IJupyterCommand,
  IJupyterCommandFactory,
  IJupyterExecution,
  IJupyterKernelSpec,
@@ -101,6 +100,7 @@ export class JupyterExecutionBase implements IJupyterExecution {
 
  // Populate the launch info that we are starting our server with
  const launchInfo: INotebookServerLaunchInfo = {
+ resource: options && options.resource,
  connectionInfo: startInfo.connection,
  currentInterpreter: version.interpreter,
  kernelSpec: startInfo.kernelSpec,

src/client/datascience/jupyter/jupyterExecutionFactory.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 'use strict';
 import { inject, injectable } from 'inversify';
-import { CancellationToken, Event, EventEmitter, Uri } from 'vscode';
+import { CancellationToken, Event, EventEmitter } from 'vscode';
 
 import { ILiveShareApi, IWorkspaceService } from '../../common/application/types';
 import { IFileSystem } from '../../common/platform/types';
@@ -14,19 +14,19 @@ import {
  IDisposableRegistry,
  ILogger
 } from '../../common/types';
-import { IInterpreterService, IKnownSearchPathsForInterpreters, PythonInterpreter } from '../../interpreter/contracts';
+import { IInterpreterService, IKnownSearchPathsForInterpreters } from '../../interpreter/contracts';
 import { IServiceContainer } from '../../ioc/types';
 import {
  IJupyterCommandFactory,
  IJupyterExecution,
  IJupyterSessionManager,
+ IJupyterVersion,
  INotebookServer,
  INotebookServerOptions
 } from '../types';
 import { GuestJupyterExecution } from './liveshare/guestJupyterExecution';
 import { HostJupyterExecution } from './liveshare/hostJupyterExecution';
 import { IRoleBasedObject, RoleBasedFactory } from './liveshare/roleBasedFactory';
-import { IJupyterVersion } from '../types';
 
 interface IJupyterExecutionInterface extends IRoleBasedObject, IJupyterExecution {
 
@@ -99,6 +99,11 @@ export class JupyterExecutionFactory implements IJupyterExecution, IAsyncDisposa
  return this.sessionChangedEventEmitter.event;
  }
 
+ public async enumerateVersions(serverURI?: string) : Promise<IJupyterVersion[]> {
+ const execution = await this.executionFactory.get();
+ return execution.enumerateVersions(serverURI);
+ }
+
  public async dispose() : Promise<void> {
  // Dispose of our execution object
  const execution = await this.executionFactory.get();

src/client/datascience/jupyter/jupyterExporter.ts

@@ -184,6 +184,6 @@ export class JupyterExporter implements INotebookExporter {
  private async extractPythonMainVersion(resource: Uri | undefined): Promise<number> {
  // Use the active interpreter
  const usableInterpreter = await this.versionCache.get(resource);
- return usableInterpreter && usableInterpreter.version ? usableInterpreter.version.major : 3;
+ return usableInterpreter && usableInterpreter.interpreter && usableInterpreter.interpreter.version ? usableInterpreter.interpreter.version.major : 3;
  }
 }

src/client/datascience/jupyter/jupyterImporter.ts

@@ -12,8 +12,8 @@ import { IFileSystem, IPlatformService } from '../../common/platform/types';
 import { IConfigurationService, IDisposableRegistry } from '../../common/types';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
-import { CodeSnippits } from '../constants';
-import { IJupyterExecution, INotebookImporter } from '../types';
+import { CodeSnippits, JupyterCommands } from '../constants';
+import { IJupyterExecution, INotebookImporter, IJupyterCommandFactory } from '../types';
 
 @injectable()
 export class JupyterImporter implements INotebookImporter {
@@ -39,6 +39,7 @@ export class JupyterImporter implements INotebookImporter {
  @inject(IDisposableRegistry) private disposableRegistry: IDisposableRegistry,
  @inject(IConfigurationService) private configuration: IConfigurationService,
  @inject(IJupyterExecution) private jupyterExecution: IJupyterExecution,
+ @inject(IJupyterCommandFactory) private commandFactory: IJupyterCommandFactory,
  @inject(IWorkspaceService) private workspaceService: IWorkspaceService,
  @inject(IPlatformService) private readonly platform: IPlatformService
  ) {
@@ -56,7 +57,7 @@ export class JupyterImporter implements INotebookImporter {
  }
 
  // Use the jupyter nbconvert functionality to turn the notebook into a python file
- if (await this.jupyterExecution.isImportSupported(Uri.file(file))) {
+ if (await this.commandFactory.getBestCommand(Uri.file(file), JupyterCommands.ConvertCommand)) {
  const fileOutput: string = await this.jupyterExecution.importNotebook(file, template);
  if (directoryChange) {
  return this.addDirectoryChange(fileOutput, directoryChange);