@datalayer/jupyter-react 0.9.2 → 0.9.3
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/Kernel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/Kernel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import { Signal } from '@lumino/signaling';
|
|
1
2
|
import { IOutput } from '@jupyterlab/nbformat';
|
|
2
3
|
import { IOutputAreaModel } from '@jupyterlab/outputarea';
|
|
3
4
|
import { Kernel, KernelMessage } from '@jupyterlab/services';
|
|
4
|
-
import { ISignal } from '@lumino/signaling';
|
|
5
5
|
export type IOPubMessageHook = (msg: KernelMessage.IIOPubMessage) => boolean | PromiseLike<boolean>;
|
|
6
6
|
export type ShellMessageHook = (msg: KernelMessage.IShellMessage) => boolean | PromiseLike<boolean>;
|
|
7
|
+
export type ExecutionResult = {
|
|
8
|
+
future: Kernel.IFuture<KernelMessage.IExecuteRequestMsg, KernelMessage.IExecuteReplyMsg> | undefined;
|
|
9
|
+
executor: KernelExecutor;
|
|
10
|
+
};
|
|
7
11
|
/**
|
|
8
12
|
* KernelExecutor options
|
|
9
13
|
*/
|
|
@@ -17,9 +21,6 @@ export interface IKernelExecutorOptions {
|
|
|
17
21
|
*/
|
|
18
22
|
model?: IOutputAreaModel;
|
|
19
23
|
}
|
|
20
|
-
/**
|
|
21
|
-
* A handler to execute code snippet.
|
|
22
|
-
*/
|
|
23
24
|
export declare class KernelExecutor {
|
|
24
25
|
private _kernelConnection;
|
|
25
26
|
private _outputs;
|
|
@@ -35,7 +36,6 @@ export declare class KernelExecutor {
|
|
|
35
36
|
*
|
|
36
37
|
* @param code Code to be executed
|
|
37
38
|
* @param options Callbacks on IOPub messages and on reply message
|
|
38
|
-
* and execution options
|
|
39
39
|
* @returns The outputs model
|
|
40
40
|
*
|
|
41
41
|
* @example
|
|
@@ -46,12 +46,9 @@ export declare class KernelExecutor {
|
|
|
46
46
|
* const outputs = await executor.execute("print('hello')");
|
|
47
47
|
* ```
|
|
48
48
|
*/
|
|
49
|
-
execute(code: string, { iopubMessageHooks, shellMessageHooks,
|
|
49
|
+
execute(code: string, { iopubMessageHooks, shellMessageHooks, }?: {
|
|
50
50
|
iopubMessageHooks?: IOPubMessageHook[];
|
|
51
51
|
shellMessageHooks?: ShellMessageHook[];
|
|
52
|
-
silent?: boolean;
|
|
53
|
-
stopOnError?: boolean;
|
|
54
|
-
storeHistory?: boolean;
|
|
55
52
|
}): Promise<IOutputAreaModel>;
|
|
56
53
|
/**
|
|
57
54
|
* Clear the kernel executor previous results.
|
|
@@ -59,6 +56,7 @@ export declare class KernelExecutor {
|
|
|
59
56
|
clear(): void;
|
|
60
57
|
private _onIOPub;
|
|
61
58
|
private _onReply;
|
|
59
|
+
registerIOPubMessageHook: (msg: IOPubMessageHook) => void;
|
|
62
60
|
/**
|
|
63
61
|
* Promise that resolves when the execution is done.
|
|
64
62
|
*/
|
|
@@ -74,7 +72,7 @@ export declare class KernelExecutor {
|
|
|
74
72
|
/**
|
|
75
73
|
* Signal emitted when the outputs list changes
|
|
76
74
|
*/
|
|
77
|
-
get outputsChanged():
|
|
75
|
+
get outputsChanged(): Signal<KernelExecutor, IOutput[]>;
|
|
78
76
|
/**
|
|
79
77
|
* Kernel outputs wrapped in a model
|
|
80
78
|
*/
|
|
@@ -82,6 +80,6 @@ export declare class KernelExecutor {
|
|
|
82
80
|
/**
|
|
83
81
|
* Signal emitted when the outputs model changes
|
|
84
82
|
*/
|
|
85
|
-
get modelChanged():
|
|
83
|
+
get modelChanged(): Signal<KernelExecutor, IOutputAreaModel>;
|
|
86
84
|
}
|
|
87
85
|
export default KernelExecutor;
|
|
@@ -3,13 +3,11 @@
|
|
|
3
3
|
*
|
|
4
4
|
* MIT License
|
|
5
5
|
*/
|
|
6
|
-
import { OutputAreaModel } from '@jupyterlab/outputarea';
|
|
7
|
-
import { PromiseDelegate } from '@lumino/coreutils';
|
|
8
6
|
import { Signal } from '@lumino/signaling';
|
|
7
|
+
// import { ISignal } from '@lumino/signaling';
|
|
8
|
+
import { PromiseDelegate } from '@lumino/coreutils';
|
|
9
|
+
import { OutputAreaModel } from '@jupyterlab/outputarea';
|
|
9
10
|
import { outputsAsString } from '../../utils/Utils';
|
|
10
|
-
/**
|
|
11
|
-
* A handler to execute code snippet.
|
|
12
|
-
*/
|
|
13
11
|
export class KernelExecutor {
|
|
14
12
|
_kernelConnection;
|
|
15
13
|
_outputs;
|
|
@@ -30,7 +28,6 @@ export class KernelExecutor {
|
|
|
30
28
|
*
|
|
31
29
|
* @param code Code to be executed
|
|
32
30
|
* @param options Callbacks on IOPub messages and on reply message
|
|
33
|
-
* and execution options
|
|
34
31
|
* @returns The outputs model
|
|
35
32
|
*
|
|
36
33
|
* @example
|
|
@@ -41,25 +38,25 @@ export class KernelExecutor {
|
|
|
41
38
|
* const outputs = await executor.execute("print('hello')");
|
|
42
39
|
* ```
|
|
43
40
|
*/
|
|
44
|
-
execute(code, { iopubMessageHooks = [], shellMessageHooks = [],
|
|
45
|
-
const future = (this._future = this._kernelConnection.requestExecute({
|
|
46
|
-
code,
|
|
47
|
-
allow_stdin: false,
|
|
48
|
-
silent,
|
|
49
|
-
stop_on_error: stopOnError,
|
|
50
|
-
store_history: storeHistory,
|
|
51
|
-
}));
|
|
52
|
-
iopubMessageHooks.forEach(hook => future.registerMessageHook(hook));
|
|
41
|
+
execute(code, { iopubMessageHooks = [], shellMessageHooks = [], } = {}) {
|
|
53
42
|
this._shellMessageHooks = shellMessageHooks;
|
|
54
|
-
future
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
43
|
+
const future = this._kernelConnection.requestExecute({
|
|
44
|
+
code,
|
|
45
|
+
});
|
|
46
|
+
this._future = future;
|
|
47
|
+
iopubMessageHooks.forEach(hook => this._future.registerMessageHook(hook));
|
|
48
|
+
this._future.onIOPub = this._onIOPub;
|
|
49
|
+
this._future.onReply = this._onReply;
|
|
50
|
+
// FIXME Handle stdin. It will require updating the `allow_stdin` param.
|
|
58
51
|
// future.onStdin = msg => {
|
|
59
52
|
// if (KernelMessage.isInputRequestMsg(msg)) {
|
|
60
53
|
// this.onInputRequest(msg, value);
|
|
61
54
|
// }
|
|
62
55
|
// };
|
|
56
|
+
// Wait for future to be done before resolving
|
|
57
|
+
this._future.done.then(() => {
|
|
58
|
+
this._executed.resolve(this._model);
|
|
59
|
+
});
|
|
63
60
|
return this._executed.promise;
|
|
64
61
|
}
|
|
65
62
|
/**
|
|
@@ -78,7 +75,17 @@ export class KernelExecutor {
|
|
|
78
75
|
const output = { ...message.content, output_type: messageType };
|
|
79
76
|
switch (messageType) {
|
|
80
77
|
case 'execute_result':
|
|
78
|
+
this._outputs.push(message.content);
|
|
79
|
+
this._outputsChanged.emit(this._outputs);
|
|
80
|
+
this._model.add(output);
|
|
81
|
+
this._modelChanged.emit(this._model);
|
|
82
|
+
break;
|
|
81
83
|
case 'display_data':
|
|
84
|
+
this._outputs.push(message.content);
|
|
85
|
+
this._outputsChanged.emit(this._outputs);
|
|
86
|
+
this._model.add(output);
|
|
87
|
+
this._modelChanged.emit(this._model);
|
|
88
|
+
break;
|
|
82
89
|
case 'stream':
|
|
83
90
|
case 'error':
|
|
84
91
|
this._outputs.push(message.content);
|
|
@@ -86,11 +93,10 @@ export class KernelExecutor {
|
|
|
86
93
|
this._model.add(output);
|
|
87
94
|
this._modelChanged.emit(this._model);
|
|
88
95
|
break;
|
|
89
|
-
case 'clear_output':
|
|
96
|
+
case 'clear_output':
|
|
90
97
|
const wait = message.content.wait;
|
|
91
98
|
this._model.clear(wait);
|
|
92
99
|
break;
|
|
93
|
-
}
|
|
94
100
|
case 'update_display_data':
|
|
95
101
|
this._outputs.push(message.content);
|
|
96
102
|
this._outputsChanged.emit(this._outputs);
|
|
@@ -99,16 +105,37 @@ export class KernelExecutor {
|
|
|
99
105
|
this._modelChanged.emit(this._model);
|
|
100
106
|
break;
|
|
101
107
|
case 'status':
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
executionState;
|
|
106
|
-
}
|
|
108
|
+
// execution_state: 'busy' 'starting' 'terminating' 'restarting' 'initializing' 'connecting' 'disconnected' 'dead' 'unknown' 'idle'
|
|
109
|
+
const executionState = message.content.execution_state;
|
|
110
|
+
executionState;
|
|
107
111
|
break;
|
|
108
112
|
default:
|
|
109
113
|
break;
|
|
110
114
|
}
|
|
111
115
|
};
|
|
116
|
+
/*
|
|
117
|
+
private _onReply = (message: KernelMessage.IShellMessage): void => {
|
|
118
|
+
if (this._future?.msg.header.msg_id !== message.parent_header.msg_id) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
const messageType: KernelMessage.ShellMessageType = message.header.msg_type;
|
|
122
|
+
this._shellMessageHooks.forEach(hook => hook(message));
|
|
123
|
+
switch (messageType) {
|
|
124
|
+
case 'execute_reply':
|
|
125
|
+
const output: IOutput = {
|
|
126
|
+
output_type: 'display_data',
|
|
127
|
+
data: (message.content as IExecuteResult).data as IMimeBundle,
|
|
128
|
+
metadata: {},
|
|
129
|
+
};
|
|
130
|
+
this._outputs.push(message.content as IExecuteResult);
|
|
131
|
+
this._outputsChanged.emit(this._outputs);
|
|
132
|
+
this._model.add(output);
|
|
133
|
+
break;
|
|
134
|
+
default:
|
|
135
|
+
break;
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
*/
|
|
112
139
|
_onReply = (message) => {
|
|
113
140
|
if (this._future?.msg.header.msg_id !== message.parent_header.msg_id) {
|
|
114
141
|
return;
|
|
@@ -148,10 +175,9 @@ export class KernelExecutor {
|
|
|
148
175
|
this._modelChanged.emit(this._model);
|
|
149
176
|
}
|
|
150
177
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
});
|
|
178
|
+
};
|
|
179
|
+
registerIOPubMessageHook = (msg) => {
|
|
180
|
+
this._future?.registerMessageHook(msg);
|
|
155
181
|
};
|
|
156
182
|
/**
|
|
157
183
|
* Promise that resolves when the execution is done.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KernelExecutor.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/KernelExecutor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"KernelExecutor.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/KernelExecutor.ts"],"names":[],"mappings":"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"}
|