Add interrupt_mode & getSpec

src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts

@@ -20,6 +20,7 @@ export class JupyterKernelSpec implements IJupyterKernelSpec {
     public readonly env: NodeJS.ProcessEnv | undefined;
     public display_name: string;
     public argv: string[];
+    public interrupt_mode?: 'message' | 'signal';
 
     // tslint:disable-next-line: no-any
     public metadata?: Record<string, any> & { interpreter?: Partial<PythonEnvironment> };
@@ -36,6 +37,8 @@ export class JupyterKernelSpec implements IJupyterKernelSpec {
         this.metadata = specModel.metadata;
         // tslint:disable-next-line: no-any
         this.env = specModel.env as any; // JSONObject, but should match
+        // tslint:disable-next-line: no-any
+        this.interrupt_mode = specModel.interrupt_mode as any;
     }
 }
 

src/client/datascience/raw-kernel/rawKernel.ts

@@ -1,16 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import type { Kernel, KernelMessage, ServerConnection } from '@jupyterlab/services';
+import { Kernel, KernelMessage, ServerConnection } from '@jupyterlab/services';
+// tslint:disable: no-any no-require-imports
+import cloneDeep = require('lodash/cloneDeep');
 import * as uuid from 'uuid/v4';
 import { isTestExecution } from '../../common/constants';
+import { traceError } from '../../common/logger';
 import { IDisposable } from '../../common/types';
 import { swallowExceptions } from '../../common/utils/misc';
 import { getNameOfKernelConnection } from '../jupyter/kernels/helpers';
 import { IKernelProcess } from '../kernel-launcher/types';
 import { IWebSocketLike } from '../kernelSocketWrapper';
 import { IKernelSocket } from '../types';
 import { RawSocket } from './rawSocket';
-// tslint:disable: no-any no-require-imports
 
 export function suppressShutdownErrors(realKernel: any) {
     // When running under a test, mark all futures as done so we
@@ -111,7 +113,16 @@ export class RawKernel implements Kernel.IKernel {
         await this.kernelProcess.dispose();
         this.socket.dispose();
     }
-    public getSpec(): Promise<Kernel.ISpecModel> {
+    public async getSpec(): Promise<Kernel.ISpecModel> {
+        if (this.kernelProcess.kernelConnectionMetadata.kind === 'startUsingKernelSpec') {
+            const kernelSpec = cloneDeep(this.kernelProcess.kernelConnectionMetadata.kernelSpec) as any;
+            const resources = 'resources' in kernelSpec ? kernelSpec.resources : {};
+            return {
+                ...kernelSpec,
+                resources
+            };
+        }
+        traceError('Fetching kernel spec from raw kernel using JLab API');
         return this.realKernel.getSpec();
     }
     public sendShellMessage<T extends KernelMessage.ShellMessageType>(

src/client/datascience/types.ts

@@ -432,6 +432,7 @@ export interface IJupyterKernelSpec {
      * Plenty of conda packages ship kernels in this manner (beakerx, etc).
      */
     interpreterPath?: string;
+    readonly interrupt_mode?: 'message' | 'signal';
 }
 
 export const INotebookImporter = Symbol('INotebookImporter');

src/test/datascience/kernel-launcher/kernelFinder.unit.test.ts

@@ -415,8 +415,8 @@ suite('Kernel Finder', () => {
             });
             // Ignore some properties when comparing.
             assert.deepEqual(
-                { ...spec, specFile: '', interpreterPath: '' },
-                { ...kernel, specFile: '', interpreterPath: '' },
+                { ...spec, specFile: '', interpreterPath: '', interrupt_mode: 'message' },
+                { ...kernel, specFile: '', interpreterPath: '', interrupt_mode: 'message' },
                 'The found kernel spec is not the same.'
             );
             fileSystem.reset();