mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-19 19:41:37 -04:00
* Fix #4029 Ensure changeKernels always resolves, even in error states This is necessary to unblock reverting the kernel on canceling Python install - startSession now correctly sets up kernel information, since a kernel is loaded there. - Remove call to change kernel on session initialize. This isn't needed due to refactor - Handle kernel change failure by attempting to fall back to old kernel - ExtensionHost $startNewSession now ensures errors are sent across the wire. - Update AttachTo and Kernel dropdowns so they handle kernel being available. This is needed since other changes mean the session is likely ready before these get going * Fix to handle python cancel and load existing scenarios - Made changes to handle failure flow when Python dialog is canceled - Made changes to handle initial load fail. Kernel and Attach To dropdowns show No Kernel / None and you can choose a kernel - Added error wrapping in ext host so that string errors make it across and aren't lost.
149 lines
4.9 KiB
TypeScript
149 lines
4.9 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
'use strict';
|
|
|
|
import { nb } from 'azdata';
|
|
import * as vscode from 'vscode';
|
|
import * as path from 'path';
|
|
import { ServerConnection } from '@jupyterlab/services';
|
|
import * as nls from 'vscode-nls';
|
|
const localize = nls.loadMessageBundle();
|
|
|
|
import { ApiWrapper } from '../common/apiWrapper';
|
|
import JupyterServerInstallation from './jupyterServerInstallation';
|
|
import * as utils from '../common/utils';
|
|
import { IServerInstance } from './common';
|
|
import { PerNotebookServerInstance, IInstanceOptions } from './serverInstance';
|
|
|
|
export interface IServerManagerOptions {
|
|
documentPath: string;
|
|
jupyterInstallation: JupyterServerInstallation;
|
|
extensionContext: vscode.ExtensionContext;
|
|
apiWrapper?: ApiWrapper;
|
|
factory?: ServerInstanceFactory;
|
|
}
|
|
export class LocalJupyterServerManager implements nb.ServerManager, vscode.Disposable {
|
|
private _serverSettings: Partial<ServerConnection.ISettings>;
|
|
private _onServerStarted = new vscode.EventEmitter<void>();
|
|
private _instanceOptions: IInstanceOptions;
|
|
private apiWrapper: ApiWrapper;
|
|
private jupyterServer: IServerInstance;
|
|
factory: ServerInstanceFactory;
|
|
constructor(private options: IServerManagerOptions) {
|
|
this.apiWrapper = options.apiWrapper || new ApiWrapper();
|
|
this.factory = options.factory || new ServerInstanceFactory();
|
|
}
|
|
|
|
public get serverSettings(): Partial<ServerConnection.ISettings> {
|
|
return this._serverSettings;
|
|
}
|
|
|
|
public get isStarted(): boolean {
|
|
return !!this.jupyterServer;
|
|
}
|
|
|
|
public get instanceOptions(): IInstanceOptions {
|
|
return this._instanceOptions;
|
|
}
|
|
|
|
public get onServerStarted(): vscode.Event<void> {
|
|
return this._onServerStarted.event;
|
|
}
|
|
|
|
public async startServer(): Promise<void> {
|
|
try {
|
|
this.jupyterServer = await this.doStartServer();
|
|
this.options.extensionContext.subscriptions.push(this);
|
|
let partialSettings = LocalJupyterServerManager.getLocalConnectionSettings(this.jupyterServer.uri);
|
|
this._serverSettings = partialSettings;
|
|
this._onServerStarted.fire();
|
|
|
|
} catch (error) {
|
|
// this is caught and notified up the stack, no longer showing a message here
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
public dispose(): void {
|
|
this.stopServer().catch(err => {
|
|
let msg = utils.getErrorMessage(err);
|
|
this.apiWrapper.showErrorMessage(localize('shutdownError', 'Shutdown of Notebook server failed: {0}', msg));
|
|
});
|
|
}
|
|
|
|
public async stopServer(): Promise<void> {
|
|
if (this.jupyterServer) {
|
|
await this.jupyterServer.stop();
|
|
}
|
|
}
|
|
|
|
public static getLocalConnectionSettings(uri: vscode.Uri): Partial<ServerConnection.ISettings> {
|
|
return {
|
|
baseUrl: `${uri.scheme}://${uri.authority}`,
|
|
token: LocalJupyterServerManager.getToken(uri.query)
|
|
};
|
|
}
|
|
|
|
private static getToken(query: string): string {
|
|
if (query) {
|
|
let parts = query.split('=');
|
|
if (parts && parts.length >= 2) {
|
|
return parts[1];
|
|
}
|
|
}
|
|
return '';
|
|
}
|
|
|
|
private get documentPath(): string {
|
|
return this.options.documentPath;
|
|
}
|
|
|
|
private async doStartServer(): Promise<IServerInstance> { // We can't find or create servers until the installation is complete
|
|
let installation = this.options.jupyterInstallation;
|
|
await installation.promptForPythonInstall();
|
|
|
|
// Calculate the path to use as the notebook-dir for Jupyter based on the path of the uri of the
|
|
// notebook to open. This will be the workspace folder if the notebook uri is inside a workspace
|
|
// folder. Otherwise, it will be the folder that the notebook is inside. Ultimately, this means
|
|
// a new notebook server will be started for each folder a notebook is opened from.
|
|
//
|
|
// eg, opening:
|
|
// /path1/nb1.ipynb
|
|
// /path2/nb2.ipynb
|
|
// /path2/nb3.ipynb
|
|
// ... will result in 2 notebook servers being started, one for /path1/ and one for /path2/
|
|
let notebookDir = this.apiWrapper.getWorkspacePathFromUri(vscode.Uri.file(this.documentPath));
|
|
notebookDir = notebookDir || path.dirname(this.documentPath);
|
|
|
|
// TODO handle notification of start/stop status
|
|
// notebookContext.updateLoadingMessage(localizedConstants.msgJupyterStarting);
|
|
|
|
// TODO refactor server instance so it doesn't need the kernel. Likely need to reimplement this
|
|
// for notebook version
|
|
let serverInstanceOptions: IInstanceOptions = {
|
|
documentPath: this.documentPath,
|
|
notebookDirectory: notebookDir,
|
|
install: installation
|
|
};
|
|
|
|
this._instanceOptions = serverInstanceOptions;
|
|
|
|
let server = this.factory.createInstance(serverInstanceOptions);
|
|
await server.configure();
|
|
await server.start();
|
|
|
|
return server;
|
|
}
|
|
}
|
|
|
|
export class ServerInstanceFactory {
|
|
|
|
createInstance(options: IInstanceOptions): IServerInstance {
|
|
return new PerNotebookServerInstance(options);
|
|
}
|
|
}
|
|
|