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

Notebooks: ensure python path dirs added to path on session start (#7968)

Browse Source 
* ensure python path dirs add to path session start

* Change logic slightly

* PR feedback from Charles
This commit is contained in:
Chris LaFreniere
2019-10-23 19:22:24 -07:00
committed by GitHub
parent b53cad78bd
commit fb4fccf2d5
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,8 @@ export class JupyterNotebookManager implements nb.NotebookManager, vscode.Dispos
private _sessionManager: JupyterSessionManager;
constructor(private _serverManager: LocalJupyterServerManager, sessionManager?: JupyterSessionManager, private apiWrapper: ApiWrapper = new ApiWrapper()) {
this._sessionManager = sessionManager || new JupyterSessionManager();
let pythonEnvVarPath = this._serverManager && this._serverManager.jupyterServerInstallation && this._serverManager.jupyterServerInstallation.pythonEnvVarPath;
this._sessionManager = sessionManager || new JupyterSessionManager(pythonEnvVarPath);
this._serverManager.onServerStarted(() => {
this.setServerSettings(this._serverManager.serverSettings);
});

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

@@ -54,6 +54,10 @@ export class LocalJupyterServerManager implements nb.ServerManager, vscode.Dispo
return this._onServerStarted.event;
}
public get jupyterServerInstallation(): JupyterServerInstallation | undefined {
return this.options && this.options.jupyterInstallation;
}
public async startServer(): Promise<void> {
try {
if (!this._jupyterServer) {

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

@@ -69,7 +69,7 @@ export class JupyterSessionManager implements nb.SessionManager {
private _sessionManager: Session.IManager;
private static _sessions: JupyterSession[] = [];
constructor() {
constructor(private _pythonEnvVarPath?: string) {
this._isReady = false;
this._ready = new Deferred<void>();
}
@@ -123,7 +123,7 @@ export class JupyterSessionManager implements nb.SessionManager {
return Promise.reject(new Error(localize('errorStartBeforeReady', "Cannot start a session, the manager is not yet initialized")));
}
let sessionImpl = await this._sessionManager.startNew(options);
let jupyterSession = new JupyterSession(sessionImpl, skipSettingEnvironmentVars);
let jupyterSession = new JupyterSession(sessionImpl, skipSettingEnvironmentVars, this._pythonEnvVarPath);
await jupyterSession.messagesComplete;
let index = JupyterSessionManager._sessions.findIndex(session => session.path === options.path);
if (index > -1) {
@@ -170,7 +170,7 @@ export class JupyterSession implements nb.ISession {
private _kernel: nb.IKernel;
private _messagesComplete: Deferred<void> = new Deferred<void>();
constructor(private sessionImpl: Session.ISession, skipSettingEnvironmentVars?: boolean) {
constructor(private sessionImpl: Session.ISession, skipSettingEnvironmentVars?: boolean, private _pythonEnvVarPath?: string) {
this.setEnvironmentVars(skipSettingEnvironmentVars);
}
@@ -335,8 +335,12 @@ export class JupyterSession implements nb.ISession {
let allCode: string = '';
for (let i = 0; i < Object.keys(process.env).length; i++) {
let key = Object.keys(process.env)[i];
// Jupyter doesn't seem to alow for setting multiple variables at once, so doing it with multiple commands
allCode += `%set_env ${key}=${process.env[key]}${EOL}`;
if (key.toLowerCase() === 'path' && this._pythonEnvVarPath) {
allCode += `%set_env ${key}=${this._pythonEnvVarPath}${EOL}`;
} else {
// Jupyter doesn't seem to alow for setting multiple variables at once, so doing it with multiple commands
allCode += `%set_env ${key}=${process.env[key]}${EOL}`;
}
}
let future = this.sessionImpl.kernel.requestExecute({
code: allCode