@datalayer/jupyter-react 0.0.13 → 0.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/JupyterExample.js +14 -11
- package/lib/JupyterExample.js.map +1 -1
- package/lib/components/cell/Cell.js +7 -4
- package/lib/components/cell/Cell.js.map +1 -1
- package/lib/components/cell/CellAdapter.d.ts +1 -1
- package/lib/components/cell/CellAdapter.js +0 -3
- package/lib/components/cell/CellAdapter.js.map +1 -1
- package/lib/components/notebook/Notebook.d.ts +0 -2
- package/lib/components/notebook/Notebook.js +38 -46
- package/lib/components/notebook/Notebook.js.map +1 -1
- package/lib/components/notebook/NotebookAdapter.d.ts +3 -4
- package/lib/components/notebook/NotebookAdapter.js +8 -12
- package/lib/components/notebook/NotebookAdapter.js.map +1 -1
- package/lib/components/notebook/NotebookCommands.js +2 -2
- package/lib/components/notebook/NotebookCommands.js.map +1 -1
- package/lib/components/notebook/NotebookState.js +1 -3
- package/lib/components/notebook/NotebookState.js.map +1 -1
- package/lib/components/notebook/cell/sidebar/base/CellSidebarWidget.js +2 -2
- package/lib/components/notebook/cell/sidebar/base/CellSidebarWidget.js.map +1 -1
- package/lib/components/outputs/Output.d.ts +0 -1
- package/lib/components/outputs/Output.js +60 -55
- package/lib/components/outputs/Output.js.map +1 -1
- package/lib/components/outputs/OutputState.js.map +1 -1
- package/lib/components/terminal/Terminal.js +6 -1
- package/lib/components/terminal/Terminal.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/jupyter/Jupyter.d.ts +2 -0
- package/lib/jupyter/Jupyter.js +3 -2
- package/lib/jupyter/Jupyter.js.map +1 -1
- package/lib/jupyter/JupyterContext.d.ts +7 -3
- package/lib/jupyter/JupyterContext.js +29 -25
- package/lib/jupyter/JupyterContext.js.map +1 -1
- package/lib/jupyter/JupyterHandlers.d.ts +2 -1
- package/lib/jupyter/JupyterHandlers.js +3 -4
- package/lib/jupyter/JupyterHandlers.js.map +1 -1
- package/lib/jupyter/services/kernel/Kernel.d.ts +5 -6
- package/lib/jupyter/services/kernel/Kernel.js +7 -32
- package/lib/jupyter/services/kernel/Kernel.js.map +1 -1
- package/lib/jupyter/utils/Ids.d.ts +2 -0
- package/lib/jupyter/utils/Ids.js +11 -0
- package/lib/jupyter/utils/Ids.js.map +1 -0
- package/lib/state/State.d.ts +3 -3
- package/lib/state/State.js.map +1 -1
- package/lib/state/Store.js +1 -4
- package/lib/state/Store.js.map +1 -1
- package/package.json +2 -2
- package/style/index.css +26 -0
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
2
2
|
import { createElement } from 'react';
|
|
3
3
|
import { createPortal } from 'react-dom';
|
|
4
|
-
import { newUuid } from '../../../../../utils/Ids';
|
|
5
|
-
import { notebookActions } from '../../../NotebookState';
|
|
4
|
+
import { newUuid } from '../../../../../jupyter/utils/Ids';
|
|
6
5
|
import { LuminoReactPortal } from '../../../../../jupyter/lumino/LuminoReactPortal';
|
|
6
|
+
import { notebookActions } from '../../../NotebookState';
|
|
7
7
|
export const DLA_CELL_HEADER_CLASS = 'dla-CellHeader-Container';
|
|
8
8
|
export class CellSidebarWidget extends LuminoReactPortal {
|
|
9
9
|
constructor(CellSidebar, nbgrader, commands, store) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellSidebarWidget.js","sourceRoot":"","sources":["../../../../../../src/components/notebook/cell/sidebar/base/CellSidebarWidget.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"CellSidebarWidget.js","sourceRoot":"","sources":["../../../../../../src/components/notebook/cell/sidebar/base/CellSidebarWidget.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAQhE,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IAEtD,YACE,WAAqD,EACrD,QAAiB,EACjB,QAAyB,EACzB,KAAY;QAEZ,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,KAAK,GAAqB;YAC9B,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,QAAQ;SACT,CAAC;QACF,MAAM,OAAO,GAAG,aAAa,CAC3B,WAAW,EACX,KAAK,CACN,CAAC;QACF,MAAM,MAAM,GAAG,YAAY,CACzB,4BAAK,SAAS,EAAE,qBAAqB,gBAClC,OAAO,YACJ,EAEN,IAAI,CAAC,IAAI,CACV,CAAC;QACF,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -6,9 +6,9 @@ import LinearProgress from '@mui/material/LinearProgress';
|
|
|
6
6
|
import { OutputAreaModel } from '@jupyterlab/outputarea';
|
|
7
7
|
import OutputAdapter from './OutputAdapter';
|
|
8
8
|
import { selectExecute, outputActions, outputReducer } from './OutputState';
|
|
9
|
+
import { useJupyter } from "./../../jupyter/JupyterContext";
|
|
9
10
|
import LuminoAttached from './../../jupyter/lumino/LuminoAttached';
|
|
10
11
|
import CodeMirrorEditor from '././../codemirror/CodeMirrorEditor';
|
|
11
|
-
import injectableStore from '../../state/Store';
|
|
12
12
|
import '@lumino/default-theme/style/index.css';
|
|
13
13
|
/*
|
|
14
14
|
import "@jupyterlab/outputarea/style/index.css";
|
|
@@ -20,89 +20,94 @@ import "@jupyter-widgets/controls/css/widgets-base.css";
|
|
|
20
20
|
import './Output.css';
|
|
21
21
|
const KernelRunning = () => (_jsx(Stack, Object.assign({ sx: { width: '100%', color: 'grey.500' }, spacing: 2 }, { children: _jsx(LinearProgress, { color: "primary" }, void 0) }), void 0));
|
|
22
22
|
export const Output = (props) => {
|
|
23
|
+
const { injectableStore } = useJupyter();
|
|
23
24
|
const { initialOutput, autoRun, code, kernel, showEditor, clearTrigger, executeTrigger, sourceId, receipt, disableRun, insertText, toolbarPosition, codePre } = props;
|
|
25
|
+
const dispatch = useDispatch();
|
|
24
26
|
const [kernelStatus, setKernelStatus] = useState('unknown');
|
|
25
|
-
const store = props.store || injectableStore;
|
|
26
27
|
useMemo(() => {
|
|
27
|
-
|
|
28
|
-
}, []);
|
|
29
|
-
const dispatch = useDispatch();
|
|
30
|
-
useEffect(() => {
|
|
31
|
-
kernel.getJupyterKernel().then((kernelConnection) => {
|
|
32
|
-
setKernelStatus(kernelConnection.status);
|
|
33
|
-
kernelConnection.statusChanged.connect((kernelConnection, status) => {
|
|
34
|
-
setKernelStatus(status);
|
|
35
|
-
});
|
|
36
|
-
});
|
|
37
|
-
return () => {
|
|
38
|
-
// kernel.getJupyterKernel().then(k => k.shutdown().then(() => console.log(`Kernel ${k.clientId} is terminated.`)));
|
|
39
|
-
};
|
|
28
|
+
injectableStore.inject('outputs', outputReducer);
|
|
40
29
|
}, []);
|
|
41
30
|
const [model] = useState(new OutputAreaModel({
|
|
42
31
|
trusted: true,
|
|
43
32
|
values: initialOutput,
|
|
44
33
|
}));
|
|
45
34
|
const outputAdapter = useMemo(() => {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
change.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (out
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
35
|
+
if (kernel) {
|
|
36
|
+
const outputAdapter = new OutputAdapter(kernel.getJupyterKernel(), model, {});
|
|
37
|
+
if (receipt) {
|
|
38
|
+
outputAdapter.outputArea.model.changed.connect((sender, change) => {
|
|
39
|
+
if (change.type === 'add') {
|
|
40
|
+
change.newValues.map(val => {
|
|
41
|
+
if (val && val.data) {
|
|
42
|
+
// const out = val.data['application/vnd.jupyter.stdout'];
|
|
43
|
+
const out = val.data['text/html'];
|
|
44
|
+
if (out) {
|
|
45
|
+
if (out.indexOf(receipt) > -1) {
|
|
46
|
+
dispatch(outputActions.grade({
|
|
47
|
+
sourceId,
|
|
48
|
+
success: true,
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
60
51
|
}
|
|
61
52
|
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
return outputAdapter;
|
|
58
|
+
}
|
|
59
|
+
}, [sourceId, kernel]);
|
|
60
|
+
useEffect(() => {
|
|
61
|
+
if (kernel) {
|
|
62
|
+
kernel.getJupyterKernel().then((kernelConnection) => {
|
|
63
|
+
setKernelStatus(kernelConnection.status);
|
|
64
|
+
kernelConnection.statusChanged.connect((kernelConnection, status) => {
|
|
65
|
+
setKernelStatus(status);
|
|
66
|
+
});
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
|
-
return
|
|
68
|
-
|
|
69
|
+
return () => {
|
|
70
|
+
// kernel.getJupyterKernel().then(k => k.shutdown().then(() => console.log(`Kernel ${k.clientId} is terminated.`)));
|
|
71
|
+
};
|
|
72
|
+
}, [kernel]);
|
|
69
73
|
const executeRequest = selectExecute(sourceId);
|
|
70
74
|
useEffect(() => {
|
|
71
|
-
if (executeRequest) {
|
|
75
|
+
if (executeRequest && outputAdapter) {
|
|
72
76
|
outputAdapter.execute(executeRequest.source);
|
|
73
77
|
}
|
|
74
|
-
}, [executeRequest]);
|
|
78
|
+
}, [executeRequest, outputAdapter]);
|
|
75
79
|
useEffect(() => {
|
|
76
|
-
if (autoRun) {
|
|
80
|
+
if (autoRun && outputAdapter) {
|
|
77
81
|
outputAdapter.execute(code);
|
|
78
82
|
}
|
|
79
|
-
}, [executeTrigger]);
|
|
83
|
+
}, [executeTrigger, outputAdapter]);
|
|
80
84
|
useEffect(() => {
|
|
81
|
-
if (showEditor) {
|
|
85
|
+
if (showEditor && outputAdapter) {
|
|
82
86
|
outputAdapter.clearOutput();
|
|
83
87
|
}
|
|
84
|
-
}, [clearTrigger]);
|
|
85
|
-
return (_jsxs(_Fragment, { children: [showEditor &&
|
|
88
|
+
}, [clearTrigger, outputAdapter]);
|
|
89
|
+
return (_jsxs(_Fragment, { children: [showEditor && outputAdapter &&
|
|
86
90
|
_jsx("div", Object.assign({ css: {
|
|
87
91
|
'& .cm-editor': {
|
|
88
92
|
borderRadius: '5px',
|
|
89
93
|
},
|
|
90
94
|
} }, { children: _jsx(CodeMirrorEditor, { autoRun: autoRun, code: code, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, sourceId: sourceId, disableRun: disableRun, insertText: insertText, toolbarPosition: toolbarPosition }, void 0) }), void 0),
|
|
91
95
|
(kernelStatus !== 'idle') && _jsx(KernelRunning, {}, void 0),
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
96
|
+
outputAdapter &&
|
|
97
|
+
_jsx("div", Object.assign({ css: {
|
|
98
|
+
'& .jp-OutputPrompt': {
|
|
99
|
+
display: 'none',
|
|
100
|
+
},
|
|
101
|
+
'& .jp-OutputArea': {
|
|
102
|
+
fontSize: '10px',
|
|
103
|
+
},
|
|
104
|
+
'& pre': {
|
|
105
|
+
fontSize: '12px',
|
|
106
|
+
wordBreak: 'break-all',
|
|
107
|
+
wordWrap: 'break-word',
|
|
108
|
+
whiteSpace: 'pre-wrap',
|
|
109
|
+
},
|
|
110
|
+
} }, { children: _jsx(LuminoAttached, { children: outputAdapter.panel }, void 0) }), void 0)] }, void 0));
|
|
106
111
|
};
|
|
107
112
|
Output.defaultProps = {
|
|
108
113
|
initialOutput: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/outputs/Output.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAoB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE3E,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/outputs/Output.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputState.js","sourceRoot":"","sources":["../../../src/components/outputs/OutputState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,oBAAoB,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAwClE,MAAM,CAAC,MAAM,kBAAkB,GAAkB;IAC/C,OAAO,EAAE,IAAI,GAAG,EAAwB;CACzC,CAAA;AAED,eAAe;AAEf,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAmC,EAAE,CACjF,WAAW,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"OutputState.js","sourceRoot":"","sources":["../../../src/components/outputs/OutputState.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,16 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
|
2
2
|
import { useEffect, useMemo } from 'react';
|
|
3
3
|
import { useDispatch } from "react-redux";
|
|
4
4
|
import TerminalAdapter from './TerminalAdapter';
|
|
5
|
-
import { terminalActions } from './TerminalState';
|
|
5
|
+
import { terminalActions, terminalReducer } from './TerminalState';
|
|
6
|
+
import { useJupyter } from './../../jupyter/JupyterContext';
|
|
6
7
|
import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
|
|
7
8
|
export const Terminal = () => {
|
|
9
|
+
const { injectableStore } = useJupyter();
|
|
8
10
|
const dispatch = useDispatch();
|
|
9
11
|
const adapter = useMemo(() => new TerminalAdapter(), []);
|
|
12
|
+
useMemo(() => {
|
|
13
|
+
injectableStore.inject('terminal', terminalReducer);
|
|
14
|
+
}, []);
|
|
10
15
|
useEffect(() => {
|
|
11
16
|
dispatch(terminalActions.update({ adapter }));
|
|
12
17
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,cAAc,MAAM,qCAAqC,CAAC;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,EAAE;QACV,eAAuB,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAC/D,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,KAAC,cAAc,cAAE,OAAO,CAAC,KAAK,WAAkB,CAAA;AACzD,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export * from './jupyter/lumino/LuminoObservable';
|
|
|
8
8
|
export * from './jupyter/lumino/LuminoReactPortal';
|
|
9
9
|
export * from './jupyter/lumino/LuminoRedux';
|
|
10
10
|
export * from './jupyter/lite/LiteServer';
|
|
11
|
+
export * from './jupyter/utils/Ids';
|
|
11
12
|
export * from './jupyter/services/Services';
|
|
12
13
|
export * from './jupyter/services/kernel/Kernel';
|
|
13
14
|
export * from './jupyter/services/kernel/KernelModel';
|
|
@@ -40,4 +41,3 @@ export * from './components/settings/Settings';
|
|
|
40
41
|
export * from './components/settings/SettingsState';
|
|
41
42
|
export * from './components/terminal/Terminal';
|
|
42
43
|
export * from './components/terminal/TerminalState';
|
|
43
|
-
export * from './utils/Ids';
|
package/lib/index.js
CHANGED
|
@@ -9,6 +9,7 @@ export * from './jupyter/lumino/LuminoObservable';
|
|
|
9
9
|
export * from './jupyter/lumino/LuminoReactPortal';
|
|
10
10
|
export * from './jupyter/lumino/LuminoRedux';
|
|
11
11
|
export * from './jupyter/lite/LiteServer';
|
|
12
|
+
export * from './jupyter/utils/Ids';
|
|
12
13
|
// Services.
|
|
13
14
|
export * from './jupyter/services/Services';
|
|
14
15
|
export * from './jupyter/services/kernel/Kernel';
|
|
@@ -53,6 +54,4 @@ export * from './components/settings/SettingsState';
|
|
|
53
54
|
// Terminal.
|
|
54
55
|
export * from './components/terminal/Terminal';
|
|
55
56
|
export * from './components/terminal/TerminalState';
|
|
56
|
-
// Utils.
|
|
57
|
-
export * from './utils/Ids';
|
|
58
57
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,WAAW;AACX,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,YAAY;AACZ,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc;AACd,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,QAAQ;AACR,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,qBAAqB;AACrB,cAAc,0CAA0C,CAAC;AACzD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mEAAmE,CAAC;AAClF,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,mDAAmD,CAAC;AAClE,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,WAAW;AACX,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,UAAU;AACV,cAAc,4BAA4B,CAAC;AAC3C,eAAe;AACf,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,WAAW;AACX,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,WAAW;AACX,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,YAAY;AACZ,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc;AACd,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,QAAQ;AACR,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,qBAAqB;AACrB,cAAc,0CAA0C,CAAC;AACzD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mEAAmE,CAAC;AAClF,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,mDAAmD,CAAC;AAClE,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,WAAW;AACX,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,UAAU;AACV,cAAc,4BAA4B,CAAC;AAC3C,eAAe;AACf,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,WAAW;AACX,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC"}
|
package/lib/jupyter/Jupyter.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { Store } from 'redux';
|
|
|
7
7
|
export declare type JupyterProps = {
|
|
8
8
|
children: React.ReactNode;
|
|
9
9
|
lite: boolean;
|
|
10
|
+
createKernel: boolean;
|
|
10
11
|
injectableStore?: Store | any;
|
|
11
12
|
collaborative?: boolean;
|
|
12
13
|
jupyterServerHttpUrl?: string;
|
|
@@ -24,6 +25,7 @@ export declare const Jupyter: {
|
|
|
24
25
|
(props: JupyterProps): import("@emotion/react/jsx-runtime").JSX.Element;
|
|
25
26
|
defaultProps: {
|
|
26
27
|
lite: boolean;
|
|
28
|
+
createKernel: boolean;
|
|
27
29
|
collaborative: boolean;
|
|
28
30
|
terminals: boolean;
|
|
29
31
|
};
|
package/lib/jupyter/Jupyter.js
CHANGED
|
@@ -17,12 +17,13 @@ const ErrorFallback = ({ error, resetErrorBoundary }) => {
|
|
|
17
17
|
* are available.
|
|
18
18
|
*/
|
|
19
19
|
export const Jupyter = (props) => {
|
|
20
|
-
const { lite } = props;
|
|
20
|
+
const { lite, createKernel } = props;
|
|
21
21
|
loadJupyterConfig(props);
|
|
22
|
-
return (_jsx(ErrorBoundary, Object.assign({ FallbackComponent: ErrorFallback }, { children: _jsx(ThemeProvider, { children: _jsx(BaseStyles, { children: _jsx(JupyterContextProvider, Object.assign({ lite: lite, baseUrl: getJupyterServerHttpUrl(), wsUrl: getJupyterServerWsUrl(), injectableStore: props.injectableStore || injectableStore, variant: "default" }, { children: props.children }), void 0) }, void 0) }, void 0) }), void 0));
|
|
22
|
+
return (_jsx(ErrorBoundary, Object.assign({ FallbackComponent: ErrorFallback }, { children: _jsx(ThemeProvider, Object.assign({ colorMode: "day" }, { children: _jsx(BaseStyles, { children: _jsx(JupyterContextProvider, Object.assign({ lite: lite, createKernel: createKernel, baseUrl: getJupyterServerHttpUrl(), wsUrl: getJupyterServerWsUrl(), injectableStore: props.injectableStore || injectableStore, variant: "default" }, { children: props.children }), void 0) }, void 0) }), void 0) }), void 0));
|
|
23
23
|
};
|
|
24
24
|
Jupyter.defaultProps = {
|
|
25
25
|
lite: false,
|
|
26
|
+
createKernel: false,
|
|
26
27
|
collaborative: false,
|
|
27
28
|
terminals: false,
|
|
28
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Jupyter.js","sourceRoot":"","sources":["../../src/jupyter/Jupyter.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,eAAe,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Jupyter.js","sourceRoot":"","sources":["../../src/jupyter/Jupyter.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,eAAe,MAAM,gBAAgB,CAAC;AAmB7C;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,kBAAkB,EAAM,EAAE,EAAE;IACzD,OAAO,CACL,6BAAK,IAAI,EAAC,OAAO,iBACf,8DAAkC;YAClC,wBAAM,KAAK,CAAC,OAAO,WAAO,aAItB,CACP,CAAA;AACH,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC7C,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACrC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO,CACL,KAAC,aAAa,kBACZ,iBAAiB,EAAE,aAAa,gBAGhC,KAAC,aAAa,kBAAC,SAAS,EAAC,KAAK,gBAC5B,KAAC,UAAU,cACT,KAAC,sBAAsB,kBACrB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,uBAAuB,EAAE,EAClC,KAAK,EAAE,qBAAqB,EAAE,EAC9B,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,eAAe,EACzD,OAAO,EAAC,SAAS,gBAEf,KAAK,CAAC,QAAQ,YACO,WACd,YACC,YACF,CACjB,CAAA;AACH,CAAC,CAAA;AAED,OAAO,CAAC,YAAY,GAAG;IACrB,IAAI,EAAE,KAAK;IACX,YAAY,EAAE,KAAK;IACnB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;CACjB,CAAA;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { ServiceManager, ServerConnection } from '@jupyterlab/services';
|
|
2
|
+
import { ServiceManager, ServerConnection, KernelManager } from '@jupyterlab/services';
|
|
3
|
+
import Kernel from './services/kernel/Kernel';
|
|
3
4
|
/**
|
|
4
5
|
* The type for the Jupyter context.
|
|
5
6
|
*/
|
|
6
7
|
export declare type JupyterContextType = {
|
|
7
8
|
lite: boolean;
|
|
8
|
-
serverSettings
|
|
9
|
+
serverSettings: ServerConnection.ISettings;
|
|
9
10
|
serviceManager?: ServiceManager;
|
|
11
|
+
kernelManager?: KernelManager;
|
|
12
|
+
kernel?: Kernel;
|
|
10
13
|
variant: string;
|
|
11
14
|
setVariant: (value: string) => void;
|
|
12
15
|
baseUrl: string;
|
|
@@ -26,13 +29,14 @@ export declare const JupyterContextConsumer: React.Consumer<JupyterContextType |
|
|
|
26
29
|
* Utiliy method to ensure the Jupyter context is authenticated
|
|
27
30
|
* with the Jupyter server.
|
|
28
31
|
*/
|
|
29
|
-
export declare const ensureJupyterAuth: () => Promise<boolean>;
|
|
32
|
+
export declare const ensureJupyterAuth: (serverSettings: ServerConnection.ISettings) => Promise<boolean>;
|
|
30
33
|
/**
|
|
31
34
|
* The Jupyter context provider.
|
|
32
35
|
*/
|
|
33
36
|
export declare const JupyterContextProvider: React.FC<{
|
|
34
37
|
children: React.ReactNode;
|
|
35
38
|
lite: boolean;
|
|
39
|
+
createKernel: boolean;
|
|
36
40
|
variant: string;
|
|
37
41
|
baseUrl: string;
|
|
38
42
|
wsUrl: string;
|
|
@@ -5,6 +5,7 @@ import { ServiceManager, ServerConnection } from '@jupyterlab/services';
|
|
|
5
5
|
import { getJupyterServerHttpUrl } from './JupyterConfig';
|
|
6
6
|
import { requestAPI } from './JupyterHandlers';
|
|
7
7
|
import { startLiteServer } from './../jupyter/lite/LiteServer';
|
|
8
|
+
import Kernel from './services/kernel/Kernel';
|
|
8
9
|
/**
|
|
9
10
|
* The instance for the Jupyter context.
|
|
10
11
|
*/
|
|
@@ -27,12 +28,8 @@ const JupyterProvider = JupyterContext.Provider;
|
|
|
27
28
|
* Utiliy method to ensure the Jupyter context is authenticated
|
|
28
29
|
* with the Jupyter server.
|
|
29
30
|
*/
|
|
30
|
-
export const ensureJupyterAuth = () => {
|
|
31
|
-
return requestAPI('api', ''
|
|
32
|
-
credentials: 'include',
|
|
33
|
-
mode: 'cors',
|
|
34
|
-
})
|
|
35
|
-
.then(data => {
|
|
31
|
+
export const ensureJupyterAuth = (serverSettings) => {
|
|
32
|
+
return requestAPI(serverSettings, 'api', '').then(data => {
|
|
36
33
|
return true;
|
|
37
34
|
})
|
|
38
35
|
.catch(reason => {
|
|
@@ -48,39 +45,44 @@ const headers = new Headers({
|
|
|
48
45
|
/**
|
|
49
46
|
* The Jupyter context provider.
|
|
50
47
|
*/
|
|
51
|
-
export const JupyterContextProvider = ({ children, lite, variant, baseUrl, wsUrl, injectableStore }) => {
|
|
48
|
+
export const JupyterContextProvider = ({ children, lite, createKernel, variant, baseUrl, wsUrl, injectableStore }) => {
|
|
52
49
|
const [_, setVariant] = useState('default');
|
|
53
|
-
const [serverSettings
|
|
50
|
+
const [serverSettings] = useState(ServerConnection.makeSettings({
|
|
51
|
+
baseUrl,
|
|
52
|
+
wsUrl,
|
|
53
|
+
appendToken: true,
|
|
54
|
+
init: {
|
|
55
|
+
credentials: "include",
|
|
56
|
+
mode: 'cors',
|
|
57
|
+
headers,
|
|
58
|
+
}
|
|
59
|
+
}));
|
|
54
60
|
const [serviceManager, setServiceManager] = useState();
|
|
61
|
+
const [kernelManager, setKernelManager] = useState();
|
|
62
|
+
const [kernel, setKernel] = useState();
|
|
55
63
|
useEffect(() => {
|
|
56
64
|
if (lite) {
|
|
57
65
|
startLiteServer().then((serviceManager) => {
|
|
58
66
|
setServiceManager(serviceManager);
|
|
67
|
+
setKernelManager(serviceManager.sessions._kernelManager);
|
|
59
68
|
});
|
|
60
69
|
}
|
|
61
70
|
else {
|
|
62
|
-
ensureJupyterAuth().then(isAuth => {
|
|
63
|
-
if (isAuth) {
|
|
64
|
-
const serverSettings = ServerConnection.makeSettings({
|
|
65
|
-
baseUrl,
|
|
66
|
-
wsUrl,
|
|
67
|
-
appendToken: true,
|
|
68
|
-
init: {
|
|
69
|
-
credentials: "include",
|
|
70
|
-
mode: 'cors',
|
|
71
|
-
headers,
|
|
72
|
-
}
|
|
73
|
-
});
|
|
74
|
-
setServerSettings(serverSettings);
|
|
75
|
-
const serviceManager = new ServiceManager({ serverSettings });
|
|
76
|
-
setServiceManager(serviceManager);
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
71
|
+
ensureJupyterAuth(serverSettings).then(isAuth => {
|
|
72
|
+
if (!isAuth) {
|
|
79
73
|
const loginUrl = getJupyterServerHttpUrl() + '/login?next=' + window.location;
|
|
80
74
|
console.warn('Redirecting to jupyter login url', loginUrl);
|
|
81
75
|
window.location.replace(loginUrl);
|
|
82
76
|
}
|
|
83
77
|
});
|
|
78
|
+
const serviceManager = new ServiceManager({ serverSettings });
|
|
79
|
+
setServiceManager(serviceManager);
|
|
80
|
+
const kernelManager = serviceManager.sessions._kernelManager;
|
|
81
|
+
setKernelManager(kernelManager);
|
|
82
|
+
if (createKernel) {
|
|
83
|
+
const kernel = new Kernel({ kernelManager });
|
|
84
|
+
setKernel(kernel);
|
|
85
|
+
}
|
|
84
86
|
}
|
|
85
87
|
setVariant(variant);
|
|
86
88
|
}, [lite, variant]);
|
|
@@ -88,6 +90,8 @@ export const JupyterContextProvider = ({ children, lite, variant, baseUrl, wsUrl
|
|
|
88
90
|
lite,
|
|
89
91
|
serverSettings,
|
|
90
92
|
serviceManager,
|
|
93
|
+
kernelManager,
|
|
94
|
+
kernel,
|
|
91
95
|
variant,
|
|
92
96
|
setVariant,
|
|
93
97
|
baseUrl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterContext.js","sourceRoot":"","sources":["../../src/jupyter/JupyterContext.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"JupyterContext.js","sourceRoot":"","sources":["../../src/jupyter/JupyterContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ServerConnection } from '@jupyterlab/services';
|
|
1
2
|
/**
|
|
2
3
|
* Call the Jupyter server API.
|
|
3
4
|
*
|
|
@@ -5,4 +6,4 @@
|
|
|
5
6
|
* @param init Initial values for the request
|
|
6
7
|
* @returns The response body interpreted as JSON
|
|
7
8
|
*/
|
|
8
|
-
export declare function requestAPI<T>(namespace?: string, endPoint?: string, init?: RequestInit): Promise<T>;
|
|
9
|
+
export declare function requestAPI<T>(serverSettings: ServerConnection.ISettings, namespace?: string, endPoint?: string, init?: RequestInit): Promise<T>;
|
|
@@ -17,14 +17,13 @@ import JupyterAuthError from './JupyterAuthError';
|
|
|
17
17
|
* @param init Initial values for the request
|
|
18
18
|
* @returns The response body interpreted as JSON
|
|
19
19
|
*/
|
|
20
|
-
export function requestAPI(namespace = '', endPoint = '', init = {}) {
|
|
20
|
+
export function requestAPI(serverSettings, namespace = '', endPoint = '', init = {}) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
// Make request to the Jupyter API.
|
|
23
|
-
const
|
|
24
|
-
const requestUrl = URLExt.join(settings.baseUrl, namespace, endPoint);
|
|
23
|
+
const requestUrl = URLExt.join(serverSettings.baseUrl, namespace, endPoint);
|
|
25
24
|
let response;
|
|
26
25
|
try {
|
|
27
|
-
response = yield ServerConnection.makeRequest(requestUrl, init,
|
|
26
|
+
response = yield ServerConnection.makeRequest(requestUrl, init, serverSettings);
|
|
28
27
|
if (response.status === 403) {
|
|
29
28
|
throw new JupyterAuthError();
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterHandlers.js","sourceRoot":"","sources":["../../src/jupyter/JupyterHandlers.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,UAAgB,UAAU,CAC9B,SAAS,GAAG,EAAE,EACd,QAAQ,GAAG,EAAE,EACb,OAAoB,EAAE;;QAEtB,mCAAmC;QACnC,MAAM,
|
|
1
|
+
{"version":3,"file":"JupyterHandlers.js","sourceRoot":"","sources":["../../src/jupyter/JupyterHandlers.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,UAAgB,UAAU,CAC9B,cAA0C,EAC1C,SAAS,GAAG,EAAE,EACd,QAAQ,GAAG,EAAE,EACb,OAAoB,EAAE;;QAEtB,mCAAmC;QACnC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC5B,cAAc,CAAC,OAAO,EACtB,SAAS,EACT,QAAQ,CACT,CAAC;QACF,IAAI,QAAkB,CAAC;QACvB,IAAI;YACF,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAChF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC3B,MAAM,IAAI,gBAAgB,EAAE,CAAC;aAC9B;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAChD;QACD,IAAI,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI;gBACF,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACzB;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;aACtD;SACF;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,MAAM,IAAI,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAAA"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import { Kernel as JupyterKernel } from '@jupyterlab/services';
|
|
1
|
+
import { Kernel as JupyterKernel, KernelManager } from '@jupyterlab/services';
|
|
2
2
|
export declare type IKernelProps = {
|
|
3
|
-
|
|
4
|
-
wsUrl?: string;
|
|
3
|
+
kernelManager: KernelManager;
|
|
5
4
|
kernelType?: string;
|
|
6
5
|
};
|
|
7
6
|
export declare class Kernel {
|
|
8
|
-
private
|
|
7
|
+
private _kernelManager;
|
|
9
8
|
private _kernelType;
|
|
10
9
|
private _kernel;
|
|
11
|
-
constructor(options
|
|
12
|
-
getJupyterKernel(): Promise<JupyterKernel.IKernelConnection>;
|
|
10
|
+
constructor(options: IKernelProps);
|
|
13
11
|
private requestKernel;
|
|
12
|
+
getJupyterKernel(): Promise<JupyterKernel.IKernelConnection>;
|
|
14
13
|
}
|
|
15
14
|
export default Kernel;
|
|
@@ -7,46 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
10
|
+
import { SessionManager } from '@jupyterlab/services';
|
|
11
11
|
import { UUID } from '@lumino/coreutils';
|
|
12
|
-
const headers = new Headers({
|
|
13
|
-
"Cache-Control": "no-cache, no-store, must-revalidate",
|
|
14
|
-
"Pragma": "no-cache",
|
|
15
|
-
"Expires": "0",
|
|
16
|
-
});
|
|
17
12
|
export class Kernel {
|
|
18
|
-
constructor(options
|
|
19
|
-
this.
|
|
20
|
-
baseUrl: options.baseUrl || (location.protocol + '//' + location.host + "/api/jupyter"),
|
|
21
|
-
wsUrl: options.wsUrl || (location.protocol.replace('http', 'ws') + '//' + location.host + "/api/jupyter"),
|
|
22
|
-
appendToken: true,
|
|
23
|
-
init: {
|
|
24
|
-
credentials: 'include',
|
|
25
|
-
mode: 'cors',
|
|
26
|
-
headers,
|
|
27
|
-
}
|
|
28
|
-
});
|
|
13
|
+
constructor(options) {
|
|
14
|
+
this._kernelManager = options.kernelManager;
|
|
29
15
|
this._kernelType = options.kernelType || 'python3';
|
|
30
16
|
this._kernel = this.requestKernel();
|
|
31
17
|
}
|
|
32
|
-
getJupyterKernel() {
|
|
33
|
-
/*
|
|
34
|
-
if (this._kernel) {
|
|
35
|
-
return this._kernel;
|
|
36
|
-
}
|
|
37
|
-
this._kernel = this.requestKernel();
|
|
38
|
-
*/
|
|
39
|
-
return this._kernel;
|
|
40
|
-
}
|
|
41
18
|
requestKernel() {
|
|
42
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
const kernelManager = new KernelManager({
|
|
44
|
-
serverSettings: this._serverSettings,
|
|
45
|
-
standby: 'never',
|
|
46
|
-
});
|
|
47
20
|
const sessionManager = new SessionManager({
|
|
48
|
-
|
|
49
|
-
kernelManager,
|
|
21
|
+
kernelManager: this._kernelManager,
|
|
50
22
|
standby: 'never',
|
|
51
23
|
});
|
|
52
24
|
yield sessionManager.ready;
|
|
@@ -60,6 +32,9 @@ export class Kernel {
|
|
|
60
32
|
return session.kernel;
|
|
61
33
|
});
|
|
62
34
|
}
|
|
35
|
+
getJupyterKernel() {
|
|
36
|
+
return this._kernel;
|
|
37
|
+
}
|
|
63
38
|
}
|
|
64
39
|
export default Kernel;
|
|
65
40
|
//# sourceMappingURL=Kernel.js.map
|