@oceanum/oceanumlab 4.6.2 → 4.7.0

package/src/index.ts

@@ -7,6 +7,7 @@ import {
 import { ICommandPalette, Notification } from '@jupyterlab/apputils';
 import { LabIcon } from '@jupyterlab/ui-components';
 import { find } from '@lumino/algorithm';
+import { Signal } from '@lumino/signaling';
 import { Widget } from '@lumino/widgets';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
@@ -21,7 +22,11 @@ import { snapshotFromIpynb, snapshotOf } from './notebookContext';
 import { notebookHost } from './notebookHost';
 import { KernelHandoff } from './kernelHandoff';
 import { runChatLoop, STOPPED } from './aiLoop';
-import { DATAMESH_UI_SERVICE, MAX_OBSERVE_ROUNDS } from './constants';
+import {
+  DATAMESH_UI_SERVICE,
+  MAX_OBSERVE_ROUNDS,
+  OCEANUM_AI_BACKEND_URL
+} from './constants';
 
 import '../style/index.css';
 
@@ -59,6 +64,12 @@ export const datamesh_connect_extension: JupyterFrontEndPlugin<void> = {
 
     // The `datameshUiUrl` setting; the default until the settings load.
     let datameshUiUrl = DATAMESH_UI_SERVICE;
+    // The `aiBackendUrl` and `datameshToken` settings for the AI chat; the
+    // defaults until the settings load.
+    let aiBackendUrl = OCEANUM_AI_BACKEND_URL;
+    let datameshTokenSetting = '';
+    // Tells the sidebar the settings above have changed.
+    const settingsChanged = new Signal<JupyterFrontEnd, void>(app);
 
     const findDatameshUI = (): DatameshUI | undefined =>
       find(
@@ -77,12 +88,15 @@ export const datamesh_connect_extension: JupyterFrontEndPlugin<void> = {
         }).then(res => console.log(res));
       }
       window.injectToken = set.get('injectToken').user as boolean;
+      aiBackendUrl = set.get('aiBackendUrl').composite as string;
+      datameshTokenSetting = set.get('datameshToken').composite as string;
       // An open Datamesh UI panel follows a change of address.
       datameshUiUrl = set.get('datameshUiUrl').composite as string;
       const datameshUI = findDatameshUI();
       if (datameshUI) {
         datameshUI.url = datameshUiUrl;
       }
+      settingsChanged.emit();
     };
     //Try to get the datamesh token from the envars
 
@@ -127,6 +141,9 @@ export const datamesh_connect_extension: JupyterFrontEndPlugin<void> = {
       openDatameshUI: openDatameshUI,
       datameshUiUrl: () => datameshUiUrl,
       datameshUiFrame: () => findDatameshUI()?.frame ?? null,
+      datameshToken: () => datameshTokenSetting,
+      aiBackendUrl: () => aiBackendUrl,
+      settingsChanged,
       commands: app.commands,
       getCurrentWidget
     });
@@ -180,7 +197,7 @@ export const oceanum_ai_extension: JupyterFrontEndPlugin<void> = {
         // The panel the current request read its selected cell from, if the
         // notebook was open: a code answer may replace that cell only there.
         let readFrom: NotebookPanel | null = null;
-        const router = new ChatRouter(settings, async () => {
+        const router = new ChatRouter(settings, app.commands, async () => {
           const open = await pin.current();
           readFrom = open;
           if (open) {