Jupyter explicit kernel

src/smc-project/jupyter/kernel-data.ts

@@ -2,6 +2,8 @@
 Use nteracts kernelspecs module to get data about all installed Jupyter kernels.
 
 The result is cached for 5s to avoid wasted effort in case of a flurry of calls.
+
+Specs: https://jupyter-client.readthedocs.io/en/stable/kernels.html#kernel-specs
 */
 
 import { findAll } from "kernelspecs";
@@ -25,7 +27,10 @@ export async function get_kernel_data(): Promise<any> {
     v.push({
       name: kernel,
       display_name: value.spec.display_name,
-      language: value.spec.language
+      language: value.spec.language,
+      interrupt_mode: value.spec.interrupt_mode,
+      env: value.spec.env,
+      metadata: value.spec.metadata
     });
   }
   v.sort(field_cmp("display_name"));

src/smc-util/db-schema.js

@@ -318,7 +318,8 @@ schema.accounts = {
           jupyter_classic: false,
           show_exec_warning: true,
           physical_keyboard: "default",
-          keyboard_variant: ""
+          keyboard_variant: "",
+          ask_jupyter_kernel: true
         },
         other_settings: {
           katex: true,
@@ -1783,8 +1784,7 @@ schema.mentions = {
     },
     error: {
       type: "string",
-      desc:
-        "some sort of error occured handling this mention"
+      desc: "some sort of error occured handling this mention"
     },
     action: {
       type: "string",
@@ -1802,7 +1802,7 @@ schema.mentions = {
         path: true,
         source: "account_id",
         target: true,
-        priority:true
+        priority: true
       },
       required_fields: {
         project_id: true,

src/smc-util/misc.js

@@ -3173,6 +3173,7 @@ exports.jupyter_language_to_name = function(lang) {
 // Find the kernel whose name is closest to the given name.
 exports.closest_kernel_match = function(name, kernel_list) {
   name = name.toLowerCase().replace("matlab", "octave");
+  name = name === "python" ? "python3" : name;
   let bestValue = -1;
   let bestMatch = null;
   for (
@@ -3181,6 +3182,8 @@ exports.closest_kernel_match = function(name, kernel_list) {
     asc ? i++ : i--
   ) {
     const k = kernel_list.get(i);
+    // filter out kernels with negative priority (using the priority would be great, though)
+    if (k.getIn(["metadata", "cocalc", "priority"], 0) < 0) continue;
     const kernel_name = k.get("name").toLowerCase();
     let v = 0;
     for (
@@ -3194,7 +3197,6 @@ exports.closest_kernel_match = function(name, kernel_list) {
         break;
       }
     }
-    // TODO: don't use regular name comparison, use compareVersionStrings
     if (
       v > bestValue ||
       (v === bestValue &&

src/smc-util/test/misc-test.coffee

@@ -1518,10 +1518,17 @@ describe 'test closest kernel matching method', ->
     python3  = immutable.fromJS {name:"python3", display_name:"Python 3", language:"python"}
     sage8_2  = immutable.fromJS {name:"sage8.2", display_name:"Sagemath 8.2", language:"python"}
     sage8_10 = immutable.fromJS {name:"sage8.10", display_name:"Sagemath 8.10", language:"python"}
-    kernels = immutable.fromJS([octave,python3,python3,sage8_2,sage8_10])
+    ir       = immutable.fromJS {name:"ir", display_name:"R (R-Project)", language:"r"}
+    ir_old   = immutable.fromJS {name:"ir-old", display_name: "R (old)", language: "r", metadata: {cocalc: {priority: -10}}}
+    kernels = immutable.fromJS([octave, python3, python3, sage8_2, sage8_10, ir, ir_old])
     it 'thinks python8 should be python3', ->
         expect(misc.closest_kernel_match("python8",kernels)).toEqual(python3)
     it 'replaces "matlab" with "octave"', ->
-        expect(misc.closest_kernel_match("matlabe",kernels)).toEqual(octave)
+        expect(misc.closest_kernel_match("matlab",kernels)).toEqual(octave)
     it 'suggests sage8.10 over sage8.2', ->
         expect(misc.closest_kernel_match("sage8",kernels)).toEqual(sage8_10)
+    it 'suggests R over ir35', ->
+        expect(misc.closest_kernel_match("ir35",kernels)).toEqual(ir)
+    it 'suggests R over ir-35', ->
+        expect(misc.closest_kernel_match("ir-35",kernels)).toEqual(ir)
+