@eclipse-lyra/extension-notebook 0.7.31 → 0.7.37

package/dist/{notebook-runtime-yB3_aIh0.js → notebook-runtime-DFffRmNN.js}

@@ -7,8 +7,8 @@ import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { marked } from "marked";
 import * as monaco from "monaco-editor";
 import monacoStyles from "monaco-editor/min/vs/editor/editor.main.css?raw";
-import { LyraPart, workspaceService, createLogger } from "@eclipse-lyra/core";
-import { PyEnv, pythonPackageManagerService } from "@eclipse-lyra/extension-python-runtime/api";
+import { LyraPart, unsubscribe, subscribe, TOPIC_CONTRIBUTEIONS_CHANGED, contributionRegistry, createLogger } from "@eclipse-lyra/core";
+import { T as TARGET_NOTEBOOK_KERNELS } from "./notebook-kernel-api--RBL5TaE.js";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -25,8 +25,12 @@ let LyraNotebookEditor = class extends LyraPart {
     super(...arguments);
     this.cellOutputs = /* @__PURE__ */ new Map();
     this.executingCells = /* @__PURE__ */ new Set();
-    this.pyConnected = false;
-    this.pyConnecting = false;
+    this.availableKernels = [];
+    this.selectedKernelId = null;
+    this.kernel = null;
+    this.kernelConnected = false;
+    this.kernelConnecting = false;
+    this.kernelVersion = void 0;
     this.editingMarkdownCells = /* @__PURE__ */ new Set();
     this.executionCounter = 0;
     this.isRunningAll = false;
@@ -49,12 +53,16 @@ let LyraNotebookEditor = class extends LyraPart {
       this.themeObserver.disconnect();
       this.themeObserver = void 0;
     }
-    if (this.pyenv) {
-      this.pyenv.close();
-      this.pyenv = void 0;
+    if (this.unsubscribeContributionsToken) {
+      unsubscribe(this.unsubscribeContributionsToken);
+      this.unsubscribeContributionsToken = void 0;
     }
-    this.pyConnected = false;
-    this.pyVersion = void 0;
+    if (this.kernel?.close) {
+      void Promise.resolve(this.kernel.close());
+    }
+    this.kernel = null;
+    this.kernelConnected = false;
+    this.kernelVersion = void 0;
   }
   async save() {
     if (!this.notebook || !this.input) return;
@@ -78,10 +86,39 @@ let LyraNotebookEditor = class extends LyraPart {
   doBeforeUI() {
     this.loadNotebook();
   }
+  async onKernelDropdownSelect(e) {
+    const value = e.detail?.item?.value ?? "";
+    const nextId = value || null;
+    if (this.selectedKernelId === nextId) return;
+    if (this.kernel?.close) void Promise.resolve(this.kernel.close());
+    this.kernel = null;
+    this.kernelConnected = false;
+    this.kernelVersion = void 0;
+    this.selectedKernelId = nextId;
+    if (this.notebook) {
+      if (!this.notebook.metadata) this.notebook.metadata = {};
+      this.notebook.metadata.kernel = nextId ?? void 0;
+    }
+    this.cellOutputs.clear();
+    this.executionCounter = 0;
+    this.notebook?.cells?.forEach((cell) => {
+      if (cell.cell_type === "code") {
+        cell.execution_count = null;
+        cell.outputs = [];
+      }
+    });
+    this.resetCellState();
+    await this.ensureKernelLoaded();
+    this.requestUpdate();
+    this.updateToolbar();
+  }
   renderToolbar() {
-    const connectionTitle = this.pyConnecting ? "Connecting to Python..." : this.pyConnected ? "Python Connected" : "Python Disconnected - Click to connect";
-    const connectionText = this.pyConnecting ? "Connecting..." : this.pyConnected && this.pyVersion ? `Python ${this.pyVersion}` : "Not connected";
-    const iconColor = this.pyConnected ? "var(--wa-color-green-40)" : this.pyConnecting ? "var(--wa-color-warning-500)" : "var(--wa-color-red-40)";
+    const kernels = this.availableKernels;
+    kernels.length > 0;
+    const currentLabel = this.selectedKernelId ? kernels.find((c) => c.id === this.selectedKernelId)?.label ?? this.selectedKernelId : "Select kernel";
+    const connectionTitle = this.kernelConnecting ? "Connecting..." : this.kernelConnected ? "Kernel connected" : "Kernel disconnected";
+    const connectionText = this.kernelConnecting ? "Connecting..." : this.kernelConnected ? this.kernelVersion ?? "Connected" : "Not connected";
+    const iconColor = this.kernelConnected ? "var(--wa-color-green-40)" : this.kernelConnecting ? "var(--wa-color-warning-500)" : "var(--wa-color-red-40)";
     const runAllButton = this.isRunningAll ? html`
             <wa-button size="small" appearance="plain" @click=${() => this.cancelAllCells()} title="Cancel running all cells">
                 <wa-icon name="stop" label="Stop"></wa-icon>
@@ -94,50 +131,174 @@ let LyraNotebookEditor = class extends LyraPart {
             </wa-button>
         `;
     return html`
-            <wa-button 
-                appearance="plain" 
+            <wa-dropdown
+                class="kernel-select"
+                placement="bottom-start"
+                distance="4"
                 size="small"
-                style="display: flex; align-items: center; gap: 0.5rem;"
-                ?disabled=${this.pyConnecting}
-                @click=${() => this.connectPython()}
-                title=${connectionTitle}>
-                <wa-icon 
-                    name="circle"
-                    label="Python status"
-                    style=${styleMap({ color: iconColor })}
-                ></wa-icon>
-                ${connectionText}
-            </wa-button>
+                @wa-select=${(e) => void this.onKernelDropdownSelect(e)}
+            >
+                <wa-button
+                    slot="trigger"
+                    appearance="plain"
+                    size="small"
+                    with-caret
+                    title="Notebook kernel"
+                >
+                    ${currentLabel}
+                </wa-button>
+                ${kernels.map(
+      (c) => html`
+                        <wa-dropdown-item
+                            value=${c.id}
+                            type="checkbox"
+                            ?checked=${c.id === this.selectedKernelId}
+                        >
+                            ${c.label}
+                        </wa-dropdown-item>
+                    `
+    )}
+            </wa-dropdown>
             ${runAllButton}
-            <wa-button 
-                size="small" 
+            <wa-button
+                size="small"
                 appearance="plain"
                 @click=${() => this.clearAllOutputs()}
-                title="Clear all outputs and reset execution counter">
+                title="Clear all outputs and reset execution counter"
+            >
                 <wa-icon name="eraser" label="Clear"></wa-icon>
                 Clear Outputs
             </wa-button>
-            <wa-button 
-                size="small" 
-                appearance="plain"
-                @click=${() => this.restartKernel()}
-                title="Restart Python kernel (clears all variables and state)"
-                ?disabled=${!this.pyConnected || this.pyConnecting}>
-                <wa-icon name="arrows-rotate" label="Restart"></wa-icon>
-                Restart Kernel
-            </wa-button>
-            <wa-button 
-                size="small" 
-                appearance="plain"
-                @click=${() => this.openPackageManager()}
-                title="Manage required packages for this notebook">
-                <wa-icon name="box" label="Packages"></wa-icon>
-                Packages
-            </wa-button>
+            ${this.kernel?.restart ? html`
+                <wa-button
+                    size="small"
+                    appearance="plain"
+                    @click=${() => void this.restartKernel()}
+                    title="Restart kernel"
+                    ?disabled=${!this.kernelConnected || this.kernelConnecting}
+                >
+                    <wa-icon name="arrows-rotate" label="Restart"></wa-icon>
+                    Restart Kernel
+                </wa-button>
+            ` : ""}
+            ${this.kernel?.openPackageManager ? html`
+                <wa-button
+                    size="small"
+                    appearance="plain"
+                    @click=${() => this.openPackageManager()}
+                    title="Manage packages"
+                >
+                    <wa-icon name="box" label="Packages"></wa-icon>
+                    Packages
+                </wa-button>
+            ` : ""}
+            ${this.kernel ? this.kernel.connect ? html`
+                <wa-button
+                    appearance="plain"
+                    size="small"
+                    style="display: flex; align-items: center; gap: 0.5rem;"
+                    ?disabled=${this.kernelConnecting}
+                    @click=${() => void this.connectKernel()}
+                    title=${connectionTitle}
+                >
+                    <wa-icon name="circle" label="Kernel status" style=${styleMap({ color: iconColor })}></wa-icon>
+                    ${connectionText}
+                </wa-button>
+            ` : html`
+                <span style="display: flex; align-items: center; gap: 0.5rem;" title=${connectionTitle}>
+                    <wa-icon name="circle" label="Kernel status" style=${styleMap({ color: iconColor })}></wa-icon>
+                    ${connectionText}
+                </span>
+            ` : ""}
         `;
   }
-  doInitUI() {
+  async connectKernel() {
+    if (this.kernelConnecting || !this.kernel?.connect) return;
+    try {
+      this.kernelConnecting = true;
+      this.requestUpdate();
+      this.updateToolbar();
+      await this.kernel.connect({
+        requiredPackages: this.notebook?.metadata?.required_packages
+      });
+      this.kernelConnected = true;
+      if (this.kernel.getVersion) this.kernelVersion = await this.kernel.getVersion();
+    } catch (err) {
+      logger.error("Failed to connect kernel", err);
+    } finally {
+      this.kernelConnecting = false;
+      this.requestUpdate();
+      this.updateToolbar();
+    }
+  }
+  async doInitUI() {
     this.setupThemeObserver();
+    this.unsubscribeContributionsToken = subscribe(TOPIC_CONTRIBUTEIONS_CHANGED, (event) => {
+      if (event?.target === TARGET_NOTEBOOK_KERNELS) {
+        void this.refreshKernels();
+      }
+    });
+    await this.refreshKernels();
+  }
+  resolveDefaultKernelId(contributions) {
+    if (!contributions.length) return null;
+    const fromMeta = this.notebook?.metadata?.kernel;
+    if (fromMeta && contributions.some((c) => c.id === fromMeta)) return fromMeta;
+    const python = contributions.find((c) => c.id === "python");
+    if (python) return python.id;
+    const js = contributions.find((c) => c.id === "javascript");
+    if (js) return js.id;
+    return contributions[0].id;
+  }
+  async refreshKernels() {
+    const contributions = contributionRegistry.getContributions(TARGET_NOTEBOOK_KERNELS);
+    this.availableKernels = contributions;
+    if (!this.selectedKernelId && contributions.length) {
+      this.selectedKernelId = this.resolveDefaultKernelId(contributions);
+      if (this.notebook && this.selectedKernelId) {
+        if (!this.notebook.metadata) this.notebook.metadata = {};
+        this.notebook.metadata.kernel = this.selectedKernelId;
+      }
+    }
+    if (this.selectedKernelId && !contributions.some((c) => c.id === this.selectedKernelId)) {
+      this.selectedKernelId = contributions.length ? contributions[0].id : null;
+    }
+    this.requestUpdate();
+    await this.ensureKernelLoaded();
+    this.updateToolbar();
+  }
+  async ensureKernelLoaded() {
+    const id = this.selectedKernelId;
+    if (!id || this.kernel?.id === id) return;
+    if (this.kernel?.close) void Promise.resolve(this.kernel.close());
+    this.kernel = null;
+    this.kernelConnected = false;
+    this.kernelVersion = void 0;
+    const contribution = this.availableKernels.find((c) => c.id === id);
+    if (!contribution) return;
+    try {
+      this.kernelConnecting = true;
+      this.requestUpdate();
+      this.updateToolbar();
+      const k = await contribution.loadKernel();
+      if (this.selectedKernelId !== id) return;
+      this.kernel = k;
+      if (k.connect) {
+        await k.connect({
+          requiredPackages: this.notebook?.metadata?.required_packages
+        });
+      }
+      this.kernelConnected = true;
+      if (k.getVersion) {
+        this.kernelVersion = await k.getVersion();
+      }
+    } catch (err) {
+      logger.error("Failed to load kernel", id, err);
+    } finally {
+      this.kernelConnecting = false;
+      this.requestUpdate();
+      this.updateToolbar();
+    }
   }
   async loadNotebook() {
     const file = this.input.data;
@@ -153,6 +314,9 @@ let LyraNotebookEditor = class extends LyraPart {
         }]
       };
     }
+    if (this.notebook?.metadata?.kernel) {
+      this.selectedKernelId = this.notebook.metadata.kernel;
+    }
     if (this.notebook?.cells) {
       const maxCount = this.notebook.cells.filter((cell) => cell.cell_type === "code").map((cell) => cell.execution_count ?? 0).reduce((max, count) => Math.max(max, count), 0);
       this.executionCounter = maxCount;
@@ -165,6 +329,7 @@ let LyraNotebookEditor = class extends LyraPart {
         }
       });
     }
+    void this.refreshKernels();
   }
   setupThemeObserver() {
     const rootElement = document.documentElement;
@@ -276,109 +441,32 @@ let LyraNotebookEditor = class extends LyraPart {
     }
     return newCell;
   }
-  async initPyodide() {
-    if (!this.pyenv) {
-      this.pyenv = new PyEnv();
-      const workspace = await workspaceService.getWorkspace();
-      if (workspace) {
-        await this.pyenv.init(workspace);
-        this.pyConnected = true;
-        try {
-          const response = await this.pyenv.execCode("import sys; sys.version.split()[0]");
-          this.pyVersion = response?.result || "Unknown";
-        } catch (error) {
-          console.error("Failed to get Python version:", error);
-          this.pyVersion = "Unknown";
-        }
-        const requiredPackages = this.notebook?.metadata?.required_packages || [];
-        if (requiredPackages.length > 0) {
-          try {
-            await this.pyenv.loadPackages(requiredPackages);
-          } catch (error) {
-            console.error("Failed to load required packages:", error);
-          }
-        }
-        try {
-          await this.pyenv.execCode(`
-try:
-    import matplotlib
-    matplotlib.use('agg')
-    
-    import matplotlib.pyplot as plt
-    import io
-    import base64
-    
-    _original_show = plt.show
-    _display_data = None
-    
-    def _patched_show(*args, **kwargs):
-        """Patched plt.show() that captures the current figure for notebook display."""
-        global _display_data
-        if plt.get_fignums():
-            fig = plt.gcf()
-            buffer = io.BytesIO()
-            fig.savefig(buffer, format='png', bbox_inches='tight', dpi=100)
-            buffer.seek(0)
-            _display_data = base64.b64encode(buffer.read()).decode('utf-8')
-            plt.close(fig)
-        # Don't call original show() as it would try to display in a window
-    
-    plt.show = _patched_show
-except ImportError:
-    # matplotlib not installed - skip configuration
-    pass
-`);
-        } catch (error) {
-          console.error("Failed to configure matplotlib:", error);
-        }
-      }
-    }
-  }
   async executeCell(cellIndex) {
     const cell = this.notebook.cells[cellIndex];
     if (cell.cell_type !== "code") return;
     this.executingCells.add(cellIndex);
     this.requestUpdate();
     try {
-      await this.initPyodide();
-      const editor = this.monacoEditors.get(cellIndex);
-      let code = editor ? editor.getValue() : this.getCellSource(cell);
-      const response = await this.pyenv.execCode(code);
-      const outputParts = [];
-      if (response && typeof response === "object" && "console" in response) {
-        const consoleOutput = response.console;
-        if (Array.isArray(consoleOutput) && consoleOutput.length > 0) {
-          const filteredOutput = consoleOutput.filter((s) => s && s.trim());
-          if (filteredOutput.length > 0) {
-            outputParts.push(...filteredOutput);
-          }
+      await this.ensureKernelLoaded();
+      const k = this.kernel;
+      if (!k) {
+        if (this.executingCells.has(cellIndex)) {
+          this.cellOutputs.set(cellIndex, { type: "error", data: "No kernel selected" });
         }
+        return;
       }
-      let imageData = void 0;
-      try {
-        const checkDisplayData = await this.pyenv.execCode('_display_data if "_display_data" in dir() else None');
-        const displayResult = checkDisplayData && typeof checkDisplayData === "object" ? checkDisplayData.result : checkDisplayData;
-        if (displayResult && String(displayResult) !== "None" && String(displayResult) !== "undefined") {
-          imageData = String(displayResult);
-          await this.pyenv.execCode("_display_data = None");
-        }
-      } catch (e) {
-        logger.debug("No display data to retrieve:", e);
-      }
-      if (!imageData) {
-        const result = response && typeof response === "object" ? response.result : response;
-        if (result !== void 0 && result !== null && String(result) !== "undefined") {
-          const resultStr = String(result);
-          if (resultStr && resultStr !== "undefined") {
-            outputParts.push(resultStr);
-          }
-        }
+      const editor = this.monacoEditors.get(cellIndex);
+      const code = editor ? editor.getValue() : this.getCellSource(cell);
+      const result = await k.execute(code);
+      if (result.error) {
+        this.cellOutputs.set(cellIndex, { type: "error", data: result.error });
+      } else {
+        this.cellOutputs.set(cellIndex, {
+          type: "execute_result",
+          data: result.data,
+          imageData: result.imageData
+        });
       }
-      this.cellOutputs.set(cellIndex, {
-        type: "execute_result",
-        data: outputParts.length > 0 ? outputParts.join("\n") : void 0,
-        imageData
-      });
       this.executionCounter++;
       cell.execution_count = this.executionCounter;
       this.markDirty(true);
@@ -386,7 +474,7 @@ except ImportError:
       if (this.executingCells.has(cellIndex)) {
         this.cellOutputs.set(cellIndex, {
           type: "error",
-          data: String(error)
+          data: error instanceof Error ? error.message : String(error)
         });
       }
     } finally {
@@ -394,25 +482,15 @@ except ImportError:
       this.requestUpdate();
     }
   }
-  async cancelExecution(cellIndex) {
-    if (!this.pyenv) return;
-    if (this.pyenv.canInterrupt()) {
-      this.pyenv.interrupt();
+  cancelExecution(cellIndex) {
+    if (this.kernel?.interrupt) {
+      this.kernel.interrupt();
     } else {
       this.cellOutputs.set(cellIndex, {
         type: "error",
-        data: "Execution cancelled by user (worker terminated - SharedArrayBuffer not available for graceful interrupt)"
+        data: "Cancellation not supported for this kernel"
       });
       this.executingCells.delete(cellIndex);
-      this.pyenv.close();
-      this.pyenv = void 0;
-      this.pyConnected = false;
-      this.pyVersion = void 0;
-      try {
-        await this.initPyodide();
-      } catch (error) {
-        console.error("Failed to reinitialize Python after cancellation:", error);
-      }
       this.requestUpdate();
     }
   }
@@ -431,20 +509,20 @@ except ImportError:
     this.requestUpdate();
   }
   async restartKernel() {
-    if (!this.pyenv || this.pyConnecting) return;
+    if (!this.kernel?.restart || this.kernelConnecting) return;
     try {
-      this.pyConnecting = true;
-      this.pyenv.close();
-      this.pyenv = void 0;
-      this.pyConnected = false;
-      this.pyVersion = void 0;
-      this.requestUpdate();
-      await this.initPyodide();
+      this.kernelConnecting = true;
       this.requestUpdate();
+      this.updateToolbar();
+      await this.kernel.restart();
+      this.kernelConnected = true;
+      if (this.kernel.getVersion) this.kernelVersion = await this.kernel.getVersion();
     } catch (error) {
-      console.error("Failed to restart kernel:", error);
+      logger.error("Failed to restart kernel", error);
     } finally {
-      this.pyConnecting = false;
+      this.kernelConnecting = false;
+      this.requestUpdate();
+      this.updateToolbar();
     }
   }
   async runAllCells() {
@@ -470,6 +548,7 @@ except ImportError:
   }
   cancelAllCells() {
     this.cancelRunAll = true;
+    this.kernel?.interrupt?.();
   }
   toggleMarkdownEdit(index) {
     if (this.editingMarkdownCells.has(index)) {
@@ -597,7 +676,7 @@ except ImportError:
             </wa-button>
         ` : html`
             <lyra-command 
-                cmd="python"
+                cmd="notebook.runCell"
                 icon="play"
                 title="Run cell"
                 size="small"
@@ -656,19 +735,6 @@ except ImportError:
             `;
     }
   }
-  async connectPython() {
-    if (this.pyConnecting || this.pyConnected) {
-      return;
-    }
-    try {
-      this.pyConnecting = true;
-      await this.initPyodide();
-    } catch (error) {
-      console.error("Failed to initialize Pyodide:", error);
-    } finally {
-      this.pyConnecting = false;
-    }
-  }
   addCell(index, cellType = "code") {
     if (!this.notebook) return;
     this.saveEditorContents();
@@ -759,9 +825,10 @@ except ImportError:
     const minHeight = 100;
     const calculatedHeight = Math.max(minHeight, lineCount * lineHeight + padding);
     container.style.height = `${calculatedHeight}px`;
+    const language = this.kernel?.language ?? "javascript";
     const editor = monaco.editor.create(container, {
       value: source,
-      language: "python",
+      language,
       theme: this.getMonacoTheme(),
       minimap: { enabled: false },
       scrollBeyondLastLine: false,
@@ -819,18 +886,14 @@ except ImportError:
     return "vs-dark";
   }
   openPackageManager() {
-    const packages = this.notebook?.metadata?.required_packages || [];
-    pythonPackageManagerService.showPackageManager({
-      packages,
-      pyenv: this.pyenv,
+    if (!this.kernel?.openPackageManager) return;
+    const packages = this.notebook?.metadata?.required_packages ?? [];
+    this.kernel.openPackageManager({
+      requiredPackages: packages,
       onPackageAdded: (packageName) => {
         if (!this.notebook) return;
-        if (!this.notebook.metadata) {
-          this.notebook.metadata = {};
-        }
-        if (!this.notebook.metadata.required_packages) {
-          this.notebook.metadata.required_packages = [];
-        }
+        if (!this.notebook.metadata) this.notebook.metadata = {};
+        if (!this.notebook.metadata.required_packages) this.notebook.metadata.required_packages = [];
         if (!this.notebook.metadata.required_packages.includes(packageName)) {
           this.notebook.metadata.required_packages.push(packageName);
           this.markDirty(true);
@@ -848,7 +911,7 @@ except ImportError:
   }
   updated(changedProperties) {
     super.updated(changedProperties);
-    if (changedProperties.has("pyConnected") || changedProperties.has("pyConnecting") || changedProperties.has("pyVersion") || changedProperties.has("isRunningAll")) {
+    if (changedProperties.has("kernelConnected") || changedProperties.has("kernelConnecting") || changedProperties.has("kernelVersion") || changedProperties.has("isRunningAll") || changedProperties.has("availableKernels") || changedProperties.has("selectedKernelId")) {
       this.updateToolbar();
     }
     if (this.notebook?.cells) {
@@ -886,15 +949,8 @@ LyraNotebookEditor.styles = css`
             width: 100%;
         }
 
-        .python-status {
-            display: flex;
-            align-items: center;
-            gap: 0.5rem;
-        }
-
-        .python-version {
-            font-size: 0.9rem;
-            opacity: 0.8;
+        .kernel-select {
+            max-width: 10rem;
         }
 
         .noteboocells {
@@ -1127,16 +1183,22 @@ __decorateClass([
 ], LyraNotebookEditor.prototype, "executingCells", 2);
 __decorateClass([
   state()
-], LyraNotebookEditor.prototype, "pyenv", 2);
+], LyraNotebookEditor.prototype, "availableKernels", 2);
+__decorateClass([
+  state()
+], LyraNotebookEditor.prototype, "selectedKernelId", 2);
+__decorateClass([
+  state()
+], LyraNotebookEditor.prototype, "kernel", 2);
 __decorateClass([
   state()
-], LyraNotebookEditor.prototype, "pyConnected", 2);
+], LyraNotebookEditor.prototype, "kernelConnected", 2);
 __decorateClass([
   state()
-], LyraNotebookEditor.prototype, "pyConnecting", 2);
+], LyraNotebookEditor.prototype, "kernelConnecting", 2);
 __decorateClass([
   state()
-], LyraNotebookEditor.prototype, "pyVersion", 2);
+], LyraNotebookEditor.prototype, "kernelVersion", 2);
 __decorateClass([
   state()
 ], LyraNotebookEditor.prototype, "editingMarkdownCells", 2);
@@ -1155,4 +1217,4 @@ LyraNotebookEditor = __decorateClass([
 export {
   LyraNotebookEditor
 };
-//# sourceMappingURL=notebook-runtime-yB3_aIh0.js.map
+//# sourceMappingURL=notebook-runtime-DFffRmNN.js.map