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

Machine Learning - Bug fixes (#10377)

Browse Source 
* Fixing ML extension bugs
This commit is contained in:
Leila Lali
2020-05-14 12:46:47 -07:00
committed by GitHub
parent d3e1675fc5
commit 0258b1727a
22 changed files with 382 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/machine-learning/src/configurations/config.ts
View File

@@ -9,10 +9,11 @@ import * as constants from '../common/constants';
import { promises as fs } from 'fs';
import * as path from 'path';
import { PackageConfigModel } from './packageConfigModel';
import * as utils from '../common/utils';
const configFileName = 'config.json';
const defaultPythonExecutable = 'python';
const defaultRExecutable = 'r';
const defaultPythonExecutable = '';
const defaultRExecutable = '';
/**
@@ -57,8 +58,22 @@ export class Config {
/**
* Returns python path from user settings
*/
public get pythonExecutable(): string {
return this.config.get(constants.pythonPathConfigKey) || defaultPythonExecutable;
public async getPythonExecutable(verify: boolean): Promise<string> {
let executable: string = this.config.get(constants.pythonPathConfigKey) || defaultPythonExecutable;
if (!executable) {
executable = utils.getDefaultPythonLocation();
} else {
const exeName = utils.getPythonExeName();
const isFolder = await utils.isDirectory(executable);
if (isFolder && executable.indexOf(exeName) < 0) {
executable = path.join(executable, exeName);
}
}
let checkExist = executable && executable.toLocaleUpperCase() !== 'PYTHON' && executable.toLocaleUpperCase() !== 'PYTHON3';
if (verify && checkExist && !await utils.exists(executable)) {
throw new Error(constants.cannotFindPython(executable));
}
return executable;
}
/**
@@ -128,8 +143,14 @@ export class Config {
/**
* Returns r path from user settings
*/
public get rExecutable(): string {
return this.config.get(constants.rPathConfigKey) || defaultRExecutable;
public async getRExecutable(verify: boolean): Promise<string> {
let executable: string = this.config.get(constants.rPathConfigKey) || defaultRExecutable;
let checkExist = executable && executable.toLocaleUpperCase() !== 'R';
if (verify && checkExist && !await utils.exists(executable)) {
throw new Error(constants.cannotFindR(executable));
}
return executable;
}
private get config(): vscode.WorkspaceConfiguration {