Machine Learning Extension - Model details (#9377)

* Machine Learning Services Extension - adding model details

extensions/machine-learning-services/src/common/apiWrapper.ts

@@ -101,4 +101,8 @@ export class ApiWrapper {
 	public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{ [key: string]: any }> {
 		return azdata.accounts.getSecurityToken(account, resource);
 	}
+
+	public showQuickPick<T extends vscode.QuickPickItem>(items: T[] | Thenable<T[]>, options?: vscode.QuickPickOptions, token?: vscode.CancellationToken): Thenable<T | undefined> {
+		return vscode.window.showQuickPick(items, options, token);
+	}
 }

extensions/machine-learning-services/src/common/constants.ts

@@ -42,9 +42,17 @@ export const rPathConfigKey = 'rPath';
 
 // Localized texts
 //
+export const msgYes = localize('msgYes', "Yes");
+export const msgNo = localize('msgNo', "No");
 export const managePackageCommandError = localize('mls.managePackages.error', "Either no connection is available or the server does not have external script enabled.");
-export function installDependenciesError(err: string): string { return localize('mls.installDependencies.error', "Failed to install dependencies. Error: {0}", err); }
+export function taskFailedError(taskName: string, err: string): string { return localize('mls.taskFailedError.error', "Failed to complete task '{0}'. Error: {1}", taskName, err); }
 export const installDependenciesMsgTaskName = localize('mls.installDependencies.msgTaskName', "Installing Machine Learning extension dependencies");
+export const noResultError = localize('mls.noResultError', "No Result returned");
+export const requiredPackagesNotInstalled = localize('mls.requiredPackagesNotInstalled', "The required dependencies are not installed");
+export function confirmInstallPythonPackages(packages: string): string {
+	return localize('mls.installDependencies.confirmInstallPythonPackages'
+		, "The following Python packages are required to install: {0}. Are you sure you want to install?", packages);
+}
 export const installDependenciesPackages = localize('mls.installDependencies.packages', "Installing required packages ...");
 export const installDependenciesPackagesAlreadyInstalled = localize('mls.installDependencies.packagesAlreadyInstalled', "Required packages are already installed.");
 export function installDependenciesGetPackagesError(err: string): string { return localize('mls.installDependencies.getPackagesError', "Failed to get installed python packages. Error: {0}", err); }
@@ -101,23 +109,27 @@ export const extLangSelectedPath = localize('extLang.selectedPath', "Selected Pa
 export const extLangInstallFailedError = localize('extLang.installFailedError', "Failed to install language");
 export const extLangUpdateFailedError = localize('extLang.updateFailedError', "Failed to update language");
 
-export const modeIld = localize('models.id', "Id");
+export const modelArtifactName = localize('models.artifactName', "Artifact Name");
 export const modelName = localize('models.name', "Name");
-export const modelSize = localize('models.size', "Size");
+export const modelDescription = localize('models.description', "Description");
+export const modelCreated = localize('models.created', "Date Created");
+export const modelVersion = localize('models.version', "Version");
 export const browseModels = localize('models.browseButton', "...");
-export const azureAccount = localize('models.azureAccount', "Account");
-export const azureSubscription = localize('models.azureSubscription', "Subscription");
-export const azureGroup = localize('models.azureGroup', "Resource Group");
-export const azureModelWorkspace = localize('models.azureModelWorkspace', "Workspace");
+export const azureAccount = localize('models.azureAccount', "Azure account");
+export const azureSubscription = localize('models.azureSubscription', "Azure subscription");
+export const azureGroup = localize('models.azureGroup', "Azure resource group");
+export const azureModelWorkspace = localize('models.azureModelWorkspace', "Azure ML workspace");
 export const azureModelFilter = localize('models.azureModelFilter', "Filter");
 export const azureModels = localize('models.azureModels', "Models");
 export const azureModelsTitle = localize('models.azureModelsTitle', "Azure models");
 export const localModelsTitle = localize('models.localModelsTitle', "Local models");
 export const modelSourcesTitle = localize('models.modelSourcesTitle', "Source location");
+export const modelSourcePageTitle = localize('models.modelSourcePageTitle', "Ender model source details");
+export const modelDetailsPageTitle = localize('models.modelDetailsPageTitle', "Provide model details");
+export const modelLocalSourceTitle = localize('models.modelLocalSourceTitle', "Source file");
 export const currentModelsTitle = localize('models.currentModelsTitle', "Models");
 export const azureRegisterModel = localize('models.azureRegisterModel', "Register");
-export const registerModelWizardTitle = localize('models.RegisterWizard', "Register");
-export const registerModelButton = localize('models.RegisterModelButton', "Register model");
+export const registerModelTitle = localize('models.RegisterWizard', "Register model");
 export const modelRegisteredSuccessfully = localize('models.modelRegisteredSuccessfully', "Model registered successfully");
 export const modelFailedToRegister = localize('models.modelFailedToRegistered', "Model failed to register");
 export const localModelSource = localize('models.localModelSource', "Upload file");
@@ -125,6 +137,8 @@ export const azureModelSource = localize('models.azureModelSource', "Import from
 export const downloadModelMsgTaskName = localize('models.downloadModelMsgTaskName', "Downloading Model from Azure");
 export const invalidAzureResourceError = localize('models.invalidAzureResourceError', "Invalid Azure resource");
 export const invalidModelToRegisterError = localize('models.invalidModelToRegisterError', "Invalid model to register");
+export const updateModelFailedError = localize('models.updateModelFailedError', "Failed to update the model");
+export const importModelFailedError = localize('models.importModelFailedError', "Failed to register the model");
 
 
 

extensions/machine-learning-services/src/common/httpClient.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import * as fs from 'fs';
 import * as request from 'request';
@@ -36,7 +35,7 @@ export class HttpClient {
 		});
 	}
 
-	public download(downloadUrl: string, targetPath: string, backgroundOperation: azdata.BackgroundOperation, outputChannel: vscode.OutputChannel): Promise<void> {
+	public download(downloadUrl: string, targetPath: string, outputChannel: vscode.OutputChannel): Promise<void> {
 		return new Promise((resolve, reject) => {
 
 			let totalMegaBytes: number | undefined = undefined;
@@ -44,12 +43,12 @@ export class HttpClient {
 			let printThreshold = 0.1;
 			let downloadRequest = request.get(downloadUrl, { timeout: DownloadTimeout })
 				.on('error', downloadError => {
-					backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, constants.downloadError);
+					outputChannel.appendLine(constants.downloadError);
 					reject(downloadError);
 				})
 				.on('response', (response) => {
 					if (response.statusCode !== 200) {
-						backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, constants.downloadError);
+						outputChannel.appendLine(constants.downloadError);
 						return reject(response.statusMessage);
 					}
 					let contentLength = response.headers['content-length'];
@@ -73,7 +72,6 @@ export class HttpClient {
 					resolve();
 				})
 				.on('error', (downloadError) => {
-					backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, 'Error');
 					reject(downloadError);
 					downloadRequest.abort();
 				});

extensions/machine-learning-services/src/common/utils.ts

@@ -3,12 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as azdata from 'azdata';
 import * as UUID from 'vscode-languageclient/lib/utils/uuid';
 import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as constants from '../common/constants';
 import { promisify } from 'util';
+import { ApiWrapper } from './apiWrapper';
 
 export async function execCommandOnTempFile<T>(content: string, command: (filePath: string) => Promise<T>): Promise<T> {
 	let tempFilePath: string = '';
@@ -101,3 +103,76 @@ export function sortPackageVersions(versions: string[], ascending: boolean = tru
 export function isWindows(): boolean {
 	return process.platform === 'win32';
 }
+
+/**
+ * Escapes all single-quotes (') by prefixing them with another single quote ('')
+ * ' => ''
+ * @param value The string to escape
+ */
+export function doubleEscapeSingleQuotes(value: string): string {
+	return value.replace(/'/g, '\'\'');
+}
+
+/**
+ * Escapes all single-bracket ([]) by replacing them with another bracket quote ([[]])
+ * ' => ''
+ * @param value The string to escape
+ */
+export function doubleEscapeSingleBrackets(value: string): string {
+	return value.replace(/\[/g, '[[').replace(/\]/g, ']]');
+}
+
+/**
+ * Installs dependencies for the extension
+ */
+export async function executeTasks<T>(apiWrapper: ApiWrapper, taskName: string, dependencies: PromiseLike<T>[], parallel: boolean): Promise<T[]> {
+	return new Promise<T[]>((resolve, reject) => {
+		let msgTaskName = taskName;
+		apiWrapper.startBackgroundOperation({
+			displayName: msgTaskName,
+			description: msgTaskName,
+			isCancelable: false,
+			operation: async op => {
+				try {
+					let result: T[] = [];
+					// Install required packages
+					//
+					if (parallel) {
+						result = await Promise.all(dependencies);
+					} else {
+						for (let index = 0; index < dependencies.length; index++) {
+							result.push(await dependencies[index]);
+						}
+					}
+					op.updateStatus(azdata.TaskStatus.Succeeded);
+					resolve(result);
+				} catch (error) {
+					let errorMsg = constants.taskFailedError(taskName, error ? error.message : '');
+					op.updateStatus(azdata.TaskStatus.Failed, errorMsg);
+					reject(errorMsg);
+				}
+			}
+		});
+	});
+}
+
+export async function promptConfirm(message: string, apiWrapper: ApiWrapper): Promise<boolean> {
+	let choices: { [id: string]: boolean } = {};
+	choices[constants.msgYes] = true;
+	choices[constants.msgNo] = false;
+
+	let options = {
+		placeHolder: message
+	};
+
+	let result = await apiWrapper.showQuickPick(Object.keys(choices).map(c => {
+		return {
+			label: c
+		};
+	}), options);
+	if (result === undefined) {
+		throw Error('invalid selection');
+	}
+
+	return choices[result.label] || false;
+}