ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-04 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Configure Python dialog to allow packages to be installed for specific kernels. (#10286)

Browse Source
This commit is contained in:
Cory Rivera
2020-05-08 16:02:59 -07:00
committed by GitHub
parent 9bcd7cdd80
commit f94a9d0d58
23 changed files with 1045 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/api/browser/mainThreadNotebook.ts
View File

@@ -184,12 +184,12 @@ class ServerManagerWrapper implements azdata.nb.ServerManager {
return this.onServerStartedEmitter.event;
}
startServer(): Thenable<void> {
return this.doStartServer();
startServer(kernelSpec: azdata.nb.IKernelSpec): Thenable<void> {
return this.doStartServer(kernelSpec);
}
private async doStartServer(): Promise<void> {
await this._proxy.ext.$doStartServer(this.handle);
private async doStartServer(kernelSpec: azdata.nb.IKernelSpec): Promise<void> {
await this._proxy.ext.$doStartServer(this.handle, kernelSpec);
this._isStarted = true;
this.onServerStartedEmitter.fire();
}

4
src/sql/workbench/api/common/extHostNotebook.ts
View File

@@ -54,8 +54,8 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
}
}
$doStartServer(managerHandle: number): Thenable<void> {
return this._withServerManager(managerHandle, (serverManager) => serverManager.startServer());
$doStartServer(managerHandle: number, kernelSpec: azdata.nb.IKernelSpec): Thenable<void> {
return this._withServerManager(managerHandle, (serverManager) => serverManager.startServer(kernelSpec));
}
$doStopServer(managerHandle: number): Thenable<void> {

2
src/sql/workbench/api/common/sqlExtHost.protocol.ts
View File

@@ -806,7 +806,7 @@ export interface ExtHostNotebookShape {
$handleNotebookClosed(notebookUri: UriComponents): void;
// Server Manager APIs
$doStartServer(managerHandle: number): Thenable<void>;
$doStartServer(managerHandle: number, kernelSpec: azdata.nb.IKernelSpec): Thenable<void>;
$doStopServer(managerHandle: number): Thenable<void>;
// Content Manager APIs

2
src/sql/workbench/contrib/notebook/test/stubs.ts
View File

@@ -178,7 +178,7 @@ export class ServerManagerStub implements nb.ServerManager {
calledEnd: boolean = false;
result: Promise<void> = undefined;
startServer(): Promise<void> {
startServer(kernelSpec: nb.IKernelSpec): Promise<void> {
this.calledStart = true;
return this.result;
}

6
src/sql/workbench/services/notebook/browser/models/clientSession.ts
View File

@@ -60,7 +60,7 @@ export class ClientSession implements IClientSession {
public async initialize(): Promise<void> {
try {
this._serverLoadFinished = this.startServer();
this._serverLoadFinished = this.startServer(this.options.kernelSpec);
await this._serverLoadFinished;
await this.initializeSession();
await this.updateCachedKernelSpec();
@@ -75,10 +75,10 @@ export class ClientSession implements IClientSession {
}
}
private async startServer(): Promise<void> {
private async startServer(kernelSpec: nb.IKernelSpec): Promise<void> {
let serverManager = this.notebookManager.serverManager;
if (serverManager) {
await serverManager.startServer();
await serverManager.startServer(kernelSpec);
if (!serverManager.isStarted) {
throw new Error(localize('ServerNotStarted', "Server did not start for unknown reason"));
}