ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove preview flag for Configure Python wizard. (#11813)

Browse Source
This commit is contained in:
Cory Rivera
2020-08-14 12:36:40 -07:00
committed by GitHub
parent 1ee4af52b4
commit ff2d2d0339
5 changed files with 25 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/notebook/src/jupyter/jupyterController.ts
View File

@@ -29,7 +29,6 @@ import { LocalPipPackageManageProvider } from './localPipPackageManageProvider';
import { LocalCondaPackageManageProvider } from './localCondaPackageManageProvider';
import { ManagePackagesDialogModel, ManagePackageDialogOptions } from '../dialog/managePackages/managePackagesDialogModel';
import { PyPiClient } from './pypiClient';
import { ConfigurePythonDialog } from '../dialog/configurePython/configurePythonDialog';
import { IconPathHelper } from '../common/iconHelper';
let untitledCounter = 0;
@@ -248,20 +247,13 @@ export class JupyterController implements vscode.Disposable {
}
public doConfigurePython(jupyterInstaller: JupyterServerInstallation): void {
if (jupyterInstaller.previewFeaturesEnabled) {
let pythonWizard = new ConfigurePythonWizard(jupyterInstaller);
pythonWizard.start().catch((err: any) => {
vscode.window.showErrorMessage(utils.getErrorMessage(err));
});
pythonWizard.setupComplete.catch((err: any) => {
vscode.window.showErrorMessage(utils.getErrorMessage(err));
});
} else {
let pythonDialog = new ConfigurePythonDialog(jupyterInstaller);
pythonDialog.showDialog().catch((err: any) => {
vscode.window.showErrorMessage(utils.getErrorMessage(err));
});
}
let pythonWizard = new ConfigurePythonWizard(jupyterInstaller);
pythonWizard.start().catch((err: any) => {
vscode.window.showErrorMessage(utils.getErrorMessage(err));
});
pythonWizard.setupComplete.catch((err: any) => {
vscode.window.showErrorMessage(utils.getErrorMessage(err));
});
}
public get jupyterInstallation() {

131
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -17,9 +17,6 @@ import * as constants from '../common/constants';
import * as utils from '../common/utils';
import { Deferred } from '../common/promise';
import { ConfigurePythonWizard } from '../dialog/configurePython/configurePythonWizard';
import { IPrompter, IQuestion, confirm } from '../prompts/question';
import CodeAdapter from '../prompts/adapter';
import { ConfigurePythonDialog } from '../dialog/configurePython/configurePythonDialog';
const localize = nls.loadMessageBundle();
const msgInstallPkgProgress = localize('msgInstallPkgProgress', "Notebook dependencies installation is in progress");
@@ -77,8 +74,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
public static readonly DefaultPythonLocation = path.join(utils.getUserHome(), 'azuredatastudio-python');
private _prompter: IPrompter;
private readonly _commonPackages: PythonPkgDetails[] = [
{
name: 'jupyter',
@@ -129,8 +124,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
this._usingConda = false;
this._installInProgress = false;
this._prompter = new CodeAdapter();
if (process.platform !== constants.winPlatform) {
this._expectedCondaPackages = this._commonPackages.concat([{ name: 'pykerberos', version: '1.2.1' }]);
} else {
@@ -189,7 +182,7 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
if (!pythonExists || forceInstall) {
await this.installPythonPackage(backgroundOperation, this._usingExistingPython, this._pythonInstallationPath, this.outputChannel);
}
await this.upgradePythonPackages(false, forceInstall, specificPackages);
await this.upgradePythonPackages(forceInstall, specificPackages);
} catch (err) {
this.outputChannel.appendLine(msgDependenciesInstallationFailed(utils.getErrorMessage(err)));
throw err;
@@ -476,53 +469,12 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
let isPythonInstalled = JupyterServerInstallation.isPythonInstalled();
let areRequiredPackagesInstalled = await this.areRequiredPackagesInstalled(kernelDisplayName);
if (!isPythonInstalled || !areRequiredPackagesInstalled) {
if (this.previewFeaturesEnabled) {
let pythonWizard = new ConfigurePythonWizard(this);
await pythonWizard.start(kernelDisplayName, true);
return pythonWizard.setupComplete.then(() => {
this._kernelSetupCache.set(kernelDisplayName, true);
});
} else {
let pythonDialog = new ConfigurePythonDialog(this);
return pythonDialog.showDialog(true);
}
}
}
/**
* Prompts user to upgrade certain python packages if they're below the minimum expected version.
*/
public async promptForPackageUpgrade(kernelName: string): Promise<void> {
if (this._runningOnSAW) {
return Promise.resolve();
}
if (this._installInProgress) {
vscode.window.showInformationMessage(msgWaitingForInstall);
return this._installCompletion.promise;
}
let requiredPackages: PythonPkgDetails[];
if (this.previewFeaturesEnabled) {
if (this._kernelSetupCache.get(kernelName)) {
return;
}
requiredPackages = this.getRequiredPackagesForKernel(kernelName);
}
this._installInProgress = true;
this._installCompletion = new Deferred<void>();
this.upgradePythonPackages(true, false, requiredPackages)
.then(() => {
this._installCompletion.resolve();
this._installInProgress = false;
this._kernelSetupCache.set(kernelName, true);
})
.catch(err => {
let errorMsg = msgDependenciesInstallationFailed(utils.getErrorMessage(err));
this._installCompletion.reject(errorMsg);
this._installInProgress = false;
let pythonWizard = new ConfigurePythonWizard(this);
await pythonWizard.start(kernelDisplayName, true);
return pythonWizard.setupComplete.then(() => {
this._kernelSetupCache.set(kernelDisplayName, true);
});
return this._installCompletion.promise;
}
}
private async areRequiredPackagesInstalled(kernelDisplayName: string): Promise<boolean> {
@@ -546,7 +498,7 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
return true;
}
private async upgradePythonPackages(promptForUpgrade: boolean, forceInstall: boolean, specificPackages?: PythonPkgDetails[]): Promise<void> {
private async upgradePythonPackages(forceInstall: boolean, specificPackages?: PythonPkgDetails[]): Promise<void> {
let expectedCondaPackages: PythonPkgDetails[];
let expectedPipPackages: PythonPkgDetails[];
if (specificPackages) {
@@ -598,63 +550,18 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
}
if (condaPackagesToInstall.length > 0 || pipPackagesToInstall.length > 0) {
let doUpgrade: boolean;
if (promptForUpgrade) {
doUpgrade = await this._prompter.promptSingle<boolean>(<IQuestion>{
type: confirm,
message: localize('confirmPackageUpgrade', "Some required python packages need to be installed. Would you like to install them now?"),
default: true
});
if (!doUpgrade) {
throw new Error(localize('configurePython.packageInstallDeclined', "Package installation was declined."));
}
} else {
doUpgrade = true;
}
if (doUpgrade) {
let installPromise = new Promise(async (resolve, reject) => {
try {
if (this._usingConda) {
await this.installCondaPackages(condaPackagesToInstall, true);
}
await this.installPipPackages(pipPackagesToInstall, true);
resolve();
} catch (err) {
reject(err);
let installPromise = new Promise(async (resolve, reject) => {
try {
if (this._usingConda) {
await this.installCondaPackages(condaPackagesToInstall, true);
}
});
if (promptForUpgrade) {
let packagesStr = condaPackagesToInstall.concat(pipPackagesToInstall).map(pkg => {
return `${pkg.name}>=${pkg.version}`;
}).join(' ');
let taskName = localize('upgradePackages.pipInstall',
"Installing {0}",
packagesStr);
let backgroundTaskComplete = new Deferred<void>();
azdata.tasks.startBackgroundOperation({
displayName: taskName,
description: taskName,
isCancelable: false,
operation: async op => {
try {
await installPromise;
op.updateStatus(azdata.TaskStatus.Succeeded);
backgroundTaskComplete.resolve();
} catch (err) {
let errorMsg = utils.getErrorMessage(err);
op.updateStatus(azdata.TaskStatus.Failed, errorMsg);
backgroundTaskComplete.reject(errorMsg);
}
}
});
await backgroundTaskComplete.promise;
} else {
await installPromise;
await this.installPipPackages(pipPackagesToInstall, true);
resolve();
} catch (err) {
reject(err);
}
}
});
await installPromise;
}
}
@@ -875,10 +782,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
public getRequiredPackagesForKernel(kernelName: string): PythonPkgDetails[] {
return this._requiredKernelPackages.get(kernelName) ?? [];
}
public get previewFeaturesEnabled(): boolean {
return vscode.workspace.getConfiguration('workbench').get('enablePreviewFeatures');
}
}
export interface PythonPkgDetails {

3
extensions/notebook/src/jupyter/jupyterServerManager.ts
View File

@@ -105,9 +105,6 @@ export class LocalJupyterServerManager implements nb.ServerManager, vscode.Dispo
private async doStartServer(kernelSpec: nb.IKernelSpec): Promise<IServerInstance> { // We can't find or create servers until the installation is complete
let installation = this.options.jupyterInstallation;
await installation.promptForPythonInstall(kernelSpec.display_name);
if (!installation.previewFeaturesEnabled) {
await installation.promptForPackageUpgrade(kernelSpec.display_name);
}
vscode.commands.executeCommand(BuiltInCommands.SetContext, CommandContext.NotebookPythonInstalled, true);
// Calculate the path to use as the notebook-dir for Jupyter based on the path of the uri of the

6
extensions/notebook/src/jupyter/jupyterSessionManager.ts
View File

@@ -237,11 +237,7 @@ export class JupyterSession implements nb.ISession {
public async changeKernel(kernelInfo: nb.IKernelSpec): Promise<nb.IKernel> {
if (this._installation) {
try {
if (this._installation.previewFeaturesEnabled) {
await this._installation.promptForPythonInstall(kernelInfo.display_name);
} else {
await this._installation.promptForPackageUpgrade(kernelInfo.display_name);
}
await this._installation.promptForPythonInstall(kernelInfo.display_name);
} catch (err) {
// Have to swallow the error here to prevent hangs when changing back to the old kernel.
console.error(err.toString());