ML - displaying all Python and R packages (including system ones) (#10603)

* displaying all packages including readonly

extensions/machine-learning/package.json

@@ -7,7 +7,7 @@
   "preview": true,
   "engines": {
     "vscode": "^1.25.0",
-    "azdata": ">=1.13.0"
+    "azdata": ">=1.18.0"
   },
   "activationEvents": [
     "onCommand:ml.command.managePackages",

extensions/machine-learning/src/common/queryRunner.ts

@@ -19,8 +19,8 @@ EXEC sp_execute_external_script
 @script=N'import pkg_resources
 import pandas
 OutputDataSet = pandas.DataFrame([(d.project_name, d.version) for d in pkg_resources.working_set])'
-select e.name, version from sys.external_libraries e join @tablevar t on e.name = t.name
-where [language] = 'PYTHON'
+select t.name, (CASE   WHEN e.name is NULL THEN 1 ELSE 0 END) as isReadOnly , version from @tablevar t
+left join sys.external_libraries e  on e.name = t.name and upper(e.[language]) = 'PYTHON'
 `;
 
 const listRPackagesQuery = `
@@ -30,9 +30,8 @@ EXEC sp_execute_external_script
 @language=N'R',
 @script=N'
 OutputDataSet <- as.data.frame(installed.packages()[,c(1,3)])'
-
-select e.name, version from sys.external_libraries e join @tablevar t on e.name = t.name
-where [language] = 'R'
+select t.name, (CASE   WHEN e.name is NULL THEN 1 ELSE 0 END) as isReadOnly , version from @tablevar t
+left join sys.external_libraries e  on e.name = t.name and upper(e.[language]) = 'R'
 `;
 
 const checkMlInstalledQuery = `
@@ -100,7 +99,8 @@ export class QueryRunner {
 			packages = result.rows.map(row => {
 				return {
 					name: row[0].displayValue,
-					version: row[1].displayValue
+					readonly: row[1].displayValue === '1',
+					version: row[2].displayValue
 				};
 			});
 		}

extensions/machine-learning/src/packageManagement/packageManageProviderBase.ts

@@ -70,8 +70,17 @@ export abstract class SqlPackageManageProviderBase {
 	 * @param packages Packages to uninstall
 	 */
 	public async uninstallPackages(packages: nbExtensionApis.IPackageDetails[], databaseName: string): Promise<void> {
+		let allPackages = await this.listPackages(databaseName);
+
 		if (packages) {
-			await Promise.all(packages.map(x => this.executeScripts(ScriptMode.Uninstall, x, databaseName)));
+			await Promise.all(packages.map(x => {
+				const originalPackage = allPackages.find(p => p.name === x.name && p.version === x.version);
+				if (originalPackage && originalPackage.readonly) {
+					return Promise.reject(`Cannot uninstalled system package '${x.name}'`);
+				} else {
+					return this.executeScripts(ScriptMode.Uninstall, x, databaseName);
+				}
+			}));
 		}
 	}
 

extensions/machine-learning/src/packageManagement/sqlRPackageManageProvider.ts

@@ -68,9 +68,10 @@ export class SqlRPackageManageProvider extends SqlPackageManageProviderBase impl
 		let credentials = await this._apiWrapper.getCredentials(connection.connectionId);
 
 		if (connection) {
+			let server = connection.serverName.replace('\\', '\\\\');
 			let database = databaseName ? `, database="${databaseName}"` : '';
 			const auth = connection.userName ? `, uid="${connection.userName}", pwd="${credentials[azdata.ConnectionOptionSpecialType.password]}"` : '';
-			let connectionParts = `server="${connection.serverName}"${auth}${database}`;
+			let connectionParts = `server="${server}"${auth}${database}`;
 			let rCommandScript = scriptMode === ScriptMode.Install ? 'sql_install.packages' : 'sql_remove.packages';
 
 			let scripts: string[] = [

extensions/machine-learning/src/test/queryRunner.test.ts

@@ -82,6 +82,11 @@ describe('Query Runner', () => {
 				isNull: false,
 				invariantCultureDisplayValue: ''
 			}, {
+				displayValue: '0',
+				isNull: false,
+				invariantCultureDisplayValue: ''
+			},
+			{
 				displayValue: '1.1.1',
 				isNull: false,
 				invariantCultureDisplayValue: ''
@@ -90,6 +95,10 @@ describe('Query Runner', () => {
 				displayValue: 'p2',
 				isNull: false,
 				invariantCultureDisplayValue: ''
+			}, {
+				displayValue: '1',
+				isNull: false,
+				invariantCultureDisplayValue: ''
 			}, {
 				displayValue: '1.1.2',
 				isNull: false,
@@ -99,10 +108,12 @@ describe('Query Runner', () => {
 		let expected = [
 			{
 				'name': 'p1',
+				'readonly': false,
 				'version': '1.1.1'
 			},
 			{
 				'name': 'p2',
+				'readonly': true,
 				'version': '1.1.2'
 			}
 		];

extensions/machine-learning/src/typings/notebookServices.d.ts

@@ -38,6 +38,7 @@ export interface IJupyterServerInstallation {
 export interface IPackageDetails {
 	name: string;
 	version: string;
+	readonly?: boolean;
 }
 
 export interface IPackageTarget {

extensions/notebook/src/types.d.ts

@@ -63,6 +63,7 @@ export interface IJupyterServerInstallation {
 export interface IPackageDetails {
 	name: string;
 	version: string;
+	readonly?: boolean;
 }
 
 /**