port the fix and fix up unit tests (microsoft#11330)

Co-authored-by: Ian Huff <ianhuff@Ians-MacBook-Pro.local>

Author: IanMatthewHuff

src/client/datascience/kernel-launcher/kernelFinder.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 'use strict';
 
+import { Kernel } from '@jupyterlab/services';
 import { inject, injectable, named } from 'inversify';
 import * as path from 'path';
 import { InterpreterUri } from '../../common/installer/types';
@@ -15,6 +16,7 @@ import {
  KNOWN_PATH_SERVICE,
  PythonInterpreter
 } from '../../interpreter/contracts';
+import { JupyterKernelSpec } from '../jupyter/kernels/jupyterKernelSpec';
 import { IJupyterKernelSpec } from '../types';
 import { IKernelFinder } from './types';
 
@@ -173,10 +175,9 @@ export class KernelFinder implements IKernelFinder {
  for (let i = 0; i < searchResults.length; i += 1) {
  if (searchResults[i].length > 0) {
  try {
- const kernelSpec: IJupyterKernelSpec = JSON.parse(
- await this.file.readFile(path.join(paths[i], searchResults[i][0], 'kernel.json'))
- );
- kernelSpec.name = searchResults[i][0];
+ const kernelJsonFile = path.join(paths[i], searchResults[i][0], 'kernel.json');
+ const kernelJson = JSON.parse(await this.file.readFile(kernelJsonFile));
+ const kernelSpec: IJupyterKernelSpec = new JupyterKernelSpec(kernelJson, kernelJsonFile);
  this.cache.push(kernelSpec);
  return kernelSpec;
  } catch (e) {
@@ -193,10 +194,10 @@ export class KernelFinder implements IKernelFinder {
  this.activeInterpreter = await this.interpreterService.getActiveInterpreter(resource);
  }
 
- const defaultSpec = {
+ const defaultSpec: Kernel.ISpecModel = {
  name: `python_defaultSpec_${Date.now()}`,
  language: 'python',
- path: this.activeInterpreter?.path!,
+ path: '<path to kernel spec.json>',
  display_name: this.activeInterpreter?.displayName ? this.activeInterpreter.displayName : 'Python 3',
  metadata: {},
  argv: [
@@ -205,11 +206,12 @@ export class KernelFinder implements IKernelFinder {
  'ipykernel_launcher',
  '-f',
  connectionFilePlaceholder
- ]
+ ],
+ resources: {}
  };
-
- this.cache.push(defaultSpec);
- return defaultSpec;
+ const kernelSpec = new JupyterKernelSpec(defaultSpec);
+ this.cache.push(kernelSpec);
+ return kernelSpec;
  }
 
  private async readCache(): Promise<IJupyterKernelSpec[]> {

src/client/datascience/kernel-launcher/kernelLauncher.ts

@@ -67,11 +67,13 @@ class KernelProcess implements IKernelProcess {
  throw new Error(`Connection file not found in kernelspec json args, ${args.join(' ')}`);
  }
  args[indexOfConnectionFile] = this.connectionFile.filePath;
- args.splice(0, 1);
+ // First part of argument is always the executable.
+ const pythonPath = this._kernelSpec.metadata?.interpreter?.path || args[0];
+ args.shift();
 
  const executionService = await this.executionFactory.create({
  resource: undefined,
- pythonPath: this._kernelSpec.path
+ pythonPath
  });
  const exeObs = executionService.execObservable(args, {});
 

src/test/datascience/kernelFinder.unit.test.ts

@@ -3,6 +3,7 @@
 'use strict';
 
 import * as assert from 'assert';
+import { expect } from 'chai';
 import * as typemoq from 'typemoq';
 
 import { Uri } from 'vscode';
@@ -34,9 +35,8 @@ suite('Kernel Finder', () => {
  const kernel: IJupyterKernelSpec = {
  name: 'testKernel',
  language: 'python',
- path: '',
+ path: '<python path>',
  display_name: 'Python 3',
- metadata: {},
  argv: ['<python path>', '-m', 'ipykernel_launcher', '-f', '<connection_file>']
  };
 
@@ -124,7 +124,7 @@ suite('Kernel Finder', () => {
  return Promise.resolve(JSON.stringify(kernel));
  });
  const spec = await kernelFinder.findKernelSpec(resource, kernelName);
- assert.deepEqual(spec, kernel);
+ expect(spec).to.deep.include(kernel);
  fileSystem.reset();
  });
 
@@ -142,7 +142,7 @@ suite('Kernel Finder', () => {
  return Promise.resolve(JSON.stringify(kernel));
  });
  const spec = await kernelFinder.findKernelSpec(activeInterpreter, kernelName);
- assert.deepEqual(spec, kernel);
+ expect(spec).to.deep.include(kernel);
  fileSystem.reset();
  });
 
@@ -160,7 +160,7 @@ suite('Kernel Finder', () => {
  return Promise.resolve(JSON.stringify(kernel));
  });
  const spec = await kernelFinder.findKernelSpec(activeInterpreter, kernelName);
- assert.deepEqual(spec, kernel);
+ expect(spec).to.deep.include(kernel);
  fileSystem.reset();
  });
 
@@ -209,7 +209,7 @@ suite('Kernel Finder', () => {
 
  // get the same kernel, but from cache
  const spec2 = await kernelFinder.findKernelSpec(resource, spec.name);
- assert.deepEqual(spec, spec2);
+ expect(spec).to.deep.include(spec2);
 
  fileSystem.verifyAll();
  fileSystem.reset();