@datalayer/jupyter-react 0.15.0 → 0.17.0

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.
Files changed (75) hide show
  1. package/lib/components/cell/Cell.js +20 -22
  2. package/lib/components/cell/Cell.js.map +1 -1
  3. package/lib/components/cell/CellAdapter.d.ts +3 -0
  4. package/lib/components/cell/CellAdapter.js +100 -5
  5. package/lib/components/cell/CellAdapter.js.map +1 -1
  6. package/lib/components/cell/CellCommands.d.ts +2 -2
  7. package/lib/components/cell/CellCommands.js +2 -2
  8. package/lib/components/cell/CellCommands.js.map +1 -1
  9. package/lib/components/cell/CellState.d.ts +17 -8
  10. package/lib/components/cell/CellState.js +57 -6
  11. package/lib/components/cell/CellState.js.map +1 -1
  12. package/lib/components/codemirror/CodeMirrorEditor.js +7 -13
  13. package/lib/components/codemirror/CodeMirrorEditor.js.map +1 -1
  14. package/lib/components/kernel/Kernelndicator.d.ts +7 -5
  15. package/lib/components/kernel/Kernelndicator.js +8 -8
  16. package/lib/components/kernel/Kernelndicator.js.map +1 -1
  17. package/lib/components/kernel/inspector/widget.js +3 -3
  18. package/lib/components/kernel/inspector/widget.js.map +1 -1
  19. package/lib/components/notebook/NotebookAdapter.js +1 -1
  20. package/lib/components/notebook/cell/metadata/CellMetadataEditor.js +23 -8
  21. package/lib/components/notebook/cell/metadata/CellMetadataEditor.js.map +1 -1
  22. package/lib/components/notebook/cell/metadata/NbGraderCells.js +4 -4
  23. package/lib/components/notebook/cell/metadata/NbGraderCells.js.map +1 -1
  24. package/lib/components/output/Output.d.ts +5 -4
  25. package/lib/components/output/Output.js +52 -39
  26. package/lib/components/output/Output.js.map +1 -1
  27. package/lib/components/output/OutputAdapter.d.ts +3 -2
  28. package/lib/components/output/OutputAdapter.js +9 -6
  29. package/lib/components/output/OutputAdapter.js.map +1 -1
  30. package/lib/components/output/OutputExecutor.d.ts +8 -0
  31. package/lib/components/output/OutputExecutor.js +28 -0
  32. package/lib/components/output/OutputExecutor.js.map +1 -0
  33. package/lib/components/output/OutputState.d.ts +23 -41
  34. package/lib/components/output/OutputState.js +53 -45
  35. package/lib/components/output/OutputState.js.map +1 -1
  36. package/lib/examples/All.js +5 -6
  37. package/lib/examples/All.js.map +1 -1
  38. package/lib/examples/Cell.js +16 -11
  39. package/lib/examples/Cell.js.map +1 -1
  40. package/lib/examples/CellExecuteControl.d.ts +1 -0
  41. package/lib/examples/CellExecuteControl.js +38 -0
  42. package/lib/examples/CellExecuteControl.js.map +1 -0
  43. package/lib/examples/Cells.js +1 -1
  44. package/lib/examples/Cells.js.map +1 -1
  45. package/lib/examples/KernelExecute.d.ts +1 -0
  46. package/lib/examples/{KernelExecResult.js → KernelExecute.js} +5 -5
  47. package/lib/examples/KernelExecute.js.map +1 -0
  48. package/lib/examples/KernelExecutor.js +3 -3
  49. package/lib/examples/KernelExecutor.js.map +1 -1
  50. package/lib/examples/NotebookInit.js +0 -1
  51. package/lib/examples/NotebookInit.js.map +1 -1
  52. package/lib/examples/NotebookKernelChange.js +0 -1
  53. package/lib/examples/NotebookKernelChange.js.map +1 -1
  54. package/lib/examples/NotebookUnmount.js +0 -1
  55. package/lib/examples/NotebookUnmount.js.map +1 -1
  56. package/lib/examples/Output.js +52 -13
  57. package/lib/examples/Output.js.map +1 -1
  58. package/lib/jupyter/kernel/Kernel.d.ts +8 -3
  59. package/lib/jupyter/kernel/Kernel.js +10 -9
  60. package/lib/jupyter/kernel/Kernel.js.map +1 -1
  61. package/lib/jupyter/kernel/KernelExecutor.d.ts +17 -10
  62. package/lib/jupyter/kernel/KernelExecutor.js +82 -63
  63. package/lib/jupyter/kernel/KernelExecutor.js.map +1 -1
  64. package/lib/jupyter/kernel/KernelState.d.ts +25 -0
  65. package/lib/jupyter/kernel/KernelState.js +56 -0
  66. package/lib/jupyter/kernel/KernelState.js.map +1 -0
  67. package/lib/state/State.d.ts +10 -10
  68. package/lib/state/State.js +10 -12
  69. package/lib/state/State.js.map +1 -1
  70. package/lib/utils/Utils.d.ts +1 -0
  71. package/lib/utils/Utils.js +4 -0
  72. package/lib/utils/Utils.js.map +1 -1
  73. package/package.json +2 -1
  74. package/lib/examples/KernelExecResult.d.ts +0 -1
  75. package/lib/examples/KernelExecResult.js.map +0 -1
@@ -38,17 +38,17 @@ export const KERNEL_STATES = new Map([
38
38
  ['disconnecting', _jsx(CircleBrownIcon, {})],
39
39
  ['undefined', _jsx(SquareWhiteLargeIcon, {})],
40
40
  ]);
41
+ export const toKernelState = (connectionStatus, status) => {
42
+ if (connectionStatus === 'connecting' ||
43
+ connectionStatus === 'disconnected') {
44
+ return connectionStatus;
45
+ }
46
+ return connectionStatus + '-' + status;
47
+ };
41
48
  export const KernelIndicator = (props) => {
42
49
  const { kernel, env } = props;
43
50
  const [connectionStatus, setConnectionStatus] = useState();
44
51
  const [status, setStatus] = useState();
45
- const toState = (connectionStatus, status) => {
46
- if (connectionStatus === 'connecting' ||
47
- connectionStatus === 'disconnected') {
48
- return connectionStatus;
49
- }
50
- return connectionStatus + '-' + status;
51
- };
52
52
  useEffect(() => {
53
53
  if (kernel) {
54
54
  setConnectionStatus(kernel?.connectionStatus);
@@ -61,7 +61,7 @@ export const KernelIndicator = (props) => {
61
61
  });
62
62
  }
63
63
  }, [kernel]);
64
- return connectionStatus && status ? (_jsx(Tooltip, { "aria-label": `${connectionStatus} - ${status} - ${env?.display_name}`, children: KERNEL_STATES.get(toState(connectionStatus, status)) })) : (_jsx(Tooltip, { "aria-label": "Undefined state", children: KERNEL_STATES.get('undefined') }));
64
+ return connectionStatus && status ? (_jsx(Tooltip, { "aria-label": `${connectionStatus} - ${status} - ${env?.display_name}`, children: KERNEL_STATES.get(toKernelState(connectionStatus, status)) })) : (_jsx(Tooltip, { "aria-label": "Undefined state", children: KERNEL_STATES.get('undefined') }));
65
65
  };
66
66
  export default KernelIndicator;
67
67
  //# sourceMappingURL=Kernelndicator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Kernelndicator.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernelndicator.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAgB,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAkBhC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAmC,IAAI,GAAG,CAAC;IACnE,CAAC,YAAY,EAAE,KAAC,eAAe,KAAG,CAAC;IACnC,CAAC,mBAAmB,EAAE,KAAC,YAAY,KAAG,CAAC;IACvC,CAAC,oBAAoB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IAC5C,CAAC,gBAAgB,EAAE,KAAC,eAAe,KAAG,CAAC;IACvC,CAAC,gBAAgB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IACxC,CAAC,uBAAuB,EAAE,KAAC,eAAe,KAAG,CAAC;IAC9C,CAAC,sBAAsB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IAC9C,CAAC,0BAA0B,EAAE,KAAC,mBAAmB,KAAG,CAAC;IACrD,CAAC,gBAAgB,EAAE,KAAC,aAAa,KAAG,CAAC;IACrC,CAAC,eAAe,EAAE,KAAC,eAAe,KAAG,CAAC;IACtC,CAAC,WAAW,EAAE,KAAC,oBAAoB,KAAG,CAAC;CACxC,CAAC,CAAC;AAOH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,EAAoB,CAAC;IAC7E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAwB,CAAC;IAC7D,MAAM,OAAO,GAAG,CACd,gBAAkC,EAClC,MAA4B,EACf,EAAE;QACf,IACE,gBAAgB,KAAK,YAAY;YACjC,gBAAgB,KAAK,cAAc,EACnC;YACA,OAAO,gBAA+B,CAAC;SACxC;QACD,OAAO,gBAAgB,GAAG,GAAG,GAAG,MAAqB,CAAC;IACxD,CAAC,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,EAAE;YACV,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAC9C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC1B,MAAM,CAAC,uBAAuB,CAAC,OAAO,CACpC,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE;gBACtB,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACxC,CAAC,CACF,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACzC,SAAS,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,OAAO,gBAAgB,IAAI,MAAM,CAAC,CAAC,CAAC,CAClC,KAAC,OAAO,kBAAa,GAAG,gBAAgB,MAAM,MAAM,MAAM,GAAG,EAAE,YAAY,EAAE,YAC1E,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,GAC7C,CACX,CAAC,CAAC,CAAC,CACF,KAAC,OAAO,kBAAY,iBAAiB,YAClC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,GACvB,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"Kernelndicator.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernelndicator.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAgB,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAmBhC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAsC,IAAI,GAAG,CAAC;IACtE,CAAC,YAAY,EAAE,KAAC,eAAe,KAAG,CAAC;IACnC,CAAC,mBAAmB,EAAE,KAAC,YAAY,KAAG,CAAC;IACvC,CAAC,oBAAoB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IAC5C,CAAC,gBAAgB,EAAE,KAAC,eAAe,KAAG,CAAC;IACvC,CAAC,gBAAgB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IACxC,CAAC,uBAAuB,EAAE,KAAC,eAAe,KAAG,CAAC;IAC9C,CAAC,sBAAsB,EAAE,KAAC,gBAAgB,KAAG,CAAC;IAC9C,CAAC,0BAA0B,EAAE,KAAC,mBAAmB,KAAG,CAAC;IACrD,CAAC,gBAAgB,EAAE,KAAC,aAAa,KAAG,CAAC;IACrC,CAAC,eAAe,EAAE,KAAC,eAAe,KAAG,CAAC;IACtC,CAAC,WAAW,EAAE,KAAC,oBAAoB,KAAG,CAAC;CACxC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,gBAAkC,EAClC,MAA4B,EACZ,EAAE;IAClB,IACE,gBAAgB,KAAK,YAAY;QACjC,gBAAgB,KAAK,cAAc,EACnC;QACA,OAAO,gBAAkC,CAAC;KAC3C;IACD,OAAO,gBAAgB,GAAG,GAAG,GAAG,MAAwB,CAAC;AAC3D,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAA2B,EAAE,EAAE;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,EAAoB,CAAC;IAC7E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAwB,CAAC;IAC7D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,EAAE;YACV,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAC9C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC1B,MAAM,CAAC,uBAAuB,CAAC,OAAO,CACpC,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE;gBACtB,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACxC,CAAC,CACF,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACzC,SAAS,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,OAAO,gBAAgB,IAAI,MAAM,CAAC,CAAC,CAAC,CAClC,KAAC,OAAO,kBAAa,GAAG,gBAAgB,MAAM,MAAM,MAAM,GAAG,EAAE,YAAY,EAAE,YAC1E,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,GACnD,CACX,CAAC,CAAC,CAAC,CACF,KAAC,OAAO,kBAAY,iBAAiB,YAClC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,GACvB,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
@@ -6,9 +6,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
6
6
  */
7
7
  import { VDomRenderer, Toolbar, ToolbarButton } from '@jupyterlab/apputils';
8
8
  import { caretDownIcon, caretRightIcon, closeIcon, jsonIcon, } from '@jupyterlab/ui-components';
9
- import { UUID } from '@lumino/coreutils';
10
9
  import { Widget, BoxLayout } from '@lumino/widgets';
11
10
  import { ObjectInspector, ObjectLabel, } from 'react-inspector';
11
+ import { newUuid } from '../../../utils';
12
12
  import { KernelSpyModel, ThreadIterator } from './model';
13
13
  import './kernelinspector.css';
14
14
  const theme = {
@@ -66,7 +66,7 @@ function Message(props) {
66
66
  export class MessageLogView extends VDomRenderer {
67
67
  constructor(model) {
68
68
  super(model);
69
- this.id = `kernelspy-messagelog-${UUID.uuid4()}`;
69
+ this.id = `kernelspy-messagelog-${newUuid()}`;
70
70
  this.addClass('dla-KernelInspector-messagelog');
71
71
  }
72
72
  /**
@@ -129,7 +129,7 @@ export class KernelSpyView extends Widget {
129
129
  super();
130
130
  this._model = new KernelSpyModel(kernel);
131
131
  this.addClass('dla-KernelInspector-view');
132
- this.id = `kernelspy-${UUID.uuid4()}`;
132
+ this.id = `kernelspy-${newUuid()}`;
133
133
  this.title.label = 'Kernel spy';
134
134
  this.title.closable = true;
135
135
  this.title.icon = jsonIcon;
@@ -1 +1 @@
1
- {"version":3,"file":"widget.js","sourceRoot":"","sources":["../../../../src/components/kernel/inspector/widget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"widget.js","sourceRoot":"","sources":["../../../../src/components/kernel/inspector/widget.tsx"],"names":[],"mappings":"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"}
@@ -388,7 +388,7 @@ export class NotebookAdapter {
388
388
  */
389
389
  setNbformat(nbformat) {
390
390
  if (nbformat === null) {
391
- throw new Error('The nformat should first be set via the constructor of NotebookAdapater');
391
+ throw new Error('The nbformat should first be set via the constructor of NotebookAdapter');
392
392
  }
393
393
  this._nbformat = nbformat;
394
394
  if (this._nbformat) {
@@ -4,22 +4,29 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
4
4
  *
5
5
  * MIT License
6
6
  */
7
- import { useState } from 'react';
7
+ import { useEffect, useState } from 'react';
8
8
  import { ActionList, TextInput } from '@primer/react';
9
9
  import { CheckIcon } from '@primer/octicons-react';
10
10
  import NbGraderType, { getNbGraderType } from './NbGraderCells';
11
+ import { newUlid } from '../../../../utils';
11
12
  export const CellMetadataEditor = (props) => {
12
13
  const { cell } = props;
13
14
  const [cellGradeType, setCellGradeType] = useState(getNbGraderType(cell));
14
- const [nbg, setNbg] = useState(cell.model.getMetadata('nbgrader') || { grade_id: '', points: 0 });
15
+ const [nbGrade, setNbGrade] = useState(cell.model.getMetadata('nbgrader') ?? { grade_id: newUlid(), points: 1 });
16
+ useEffect(() => {
17
+ setNbGrade({
18
+ grade_id: nbGrade.grade_id ?? newUlid(),
19
+ points: nbGrade.points ?? 1,
20
+ });
21
+ }, [nbGrade]);
15
22
  const handleGradeIdChange = (cell, gradeId) => {
16
23
  const nbgrader = cell.model.getMetadata('nbgrader');
17
24
  cell.model.setMetadata('nbgrader', {
18
25
  ...nbgrader,
19
26
  grade_id: gradeId,
20
27
  });
21
- setNbg({
22
- ...nbg,
28
+ setNbGrade({
29
+ ...nbGrade,
23
30
  grade_id: gradeId,
24
31
  });
25
32
  };
@@ -31,8 +38,8 @@ export const CellMetadataEditor = (props) => {
31
38
  ...nbgrader,
32
39
  points: points_number,
33
40
  });
34
- setNbg({
35
- ...nbg,
41
+ setNbGrade({
42
+ ...nbGrade,
36
43
  points: points_number,
37
44
  });
38
45
  }
@@ -52,6 +59,8 @@ export const CellMetadataEditor = (props) => {
52
59
  solution: true,
53
60
  locked: false,
54
61
  task: false,
62
+ grade_id: newUlid(),
63
+ points: 1,
55
64
  });
56
65
  setCellGradeType(NbGraderType.AutogradedAnswer);
57
66
  break;
@@ -64,6 +73,8 @@ export const CellMetadataEditor = (props) => {
64
73
  solution: false,
65
74
  locked: false,
66
75
  task: false,
76
+ grade_id: newUlid(),
77
+ points: 1,
67
78
  });
68
79
  setCellGradeType(NbGraderType.AutogradedTest);
69
80
  break;
@@ -76,6 +87,8 @@ export const CellMetadataEditor = (props) => {
76
87
  solution: true,
77
88
  locked: false,
78
89
  task: false,
90
+ grade_id: newUlid(),
91
+ points: 1,
79
92
  });
80
93
  setCellGradeType(NbGraderType.ManuallyGradedAnswer);
81
94
  break;
@@ -89,6 +102,8 @@ export const CellMetadataEditor = (props) => {
89
102
  solution: false,
90
103
  locked: true,
91
104
  task: true,
105
+ grade_id: newUlid(),
106
+ points: 1,
92
107
  });
93
108
  setCellGradeType(NbGraderType.ManuallyGradedTask);
94
109
  break;
@@ -107,10 +122,10 @@ export const CellMetadataEditor = (props) => {
107
122
  }
108
123
  }
109
124
  };
110
- return (_jsxs(ActionList, { showDividers: true, children: [_jsx(ActionList.Divider, {}), _jsxs(ActionList.Group, { title: "NbGrader Cell Type", variant: "subtle", children: [_jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.NotGraded), children: [cellGradeType === NbGraderType.NotGraded && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "None", _jsx(ActionList.Description, { variant: "block", children: "Not a grader cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.AutogradedAnswer), children: [cellGradeType === NbGraderType.AutogradedAnswer && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Autograded answer", _jsx(ActionList.Description, { variant: "block", children: "An autograded answer cell." })] }), _jsxs(ActionList.Item, { role: "listitem", onClick: e => assignCellGradeType(cell, NbGraderType.AutogradedTest), children: [cellGradeType === NbGraderType.AutogradedTest && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Autograded test", _jsx(ActionList.Description, { variant: "block", children: "An autograded test cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ManuallyGradedTask), children: [cellGradeType === NbGraderType.ManuallyGradedTask && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Manually graded task", _jsx(ActionList.Description, { variant: "block", children: "A manually graded task cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ManuallyGradedAnswer), children: [cellGradeType === NbGraderType.ManuallyGradedAnswer && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Manually graded answer", _jsx(ActionList.Description, { variant: "block", children: "A manually graded answer cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ReadonlyGraded), children: [cellGradeType === NbGraderType.ReadonlyGraded && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Readonly", _jsx(ActionList.Description, { variant: "block", children: "A readonly grader cell." })] })] }), cellGradeType !== NbGraderType.NotGraded && (_jsxs(ActionList.Group, { title: "NbGrader Metadata", variant: "subtle", children: [_jsxs(ActionList.Item, { onSelect: e => e.preventDefault(), children: ["Grade ID:", ' ', _jsx(TextInput, { block: true, value: nbg.grade_id, onChange: e => {
125
+ return (_jsxs(ActionList, { showDividers: true, children: [_jsx(ActionList.Divider, {}), _jsxs(ActionList.Group, { title: "NbGrader Cell Type", variant: "subtle", children: [_jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.NotGraded), children: [cellGradeType === NbGraderType.NotGraded && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "None", _jsx(ActionList.Description, { variant: "block", children: "Not a grader cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.AutogradedAnswer), children: [cellGradeType === NbGraderType.AutogradedAnswer && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Autograded answer", _jsx(ActionList.Description, { variant: "block", children: "An autograded answer cell." })] }), _jsxs(ActionList.Item, { role: "listitem", onClick: e => assignCellGradeType(cell, NbGraderType.AutogradedTest), children: [cellGradeType === NbGraderType.AutogradedTest && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Autograded test", _jsx(ActionList.Description, { variant: "block", children: "An autograded test cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ManuallyGradedTask), children: [cellGradeType === NbGraderType.ManuallyGradedTask && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Manually graded task", _jsx(ActionList.Description, { variant: "block", children: "A manually graded task cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ManuallyGradedAnswer), children: [cellGradeType === NbGraderType.ManuallyGradedAnswer && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Manually graded answer", _jsx(ActionList.Description, { variant: "block", children: "A manually graded answer cell." })] }), _jsxs(ActionList.Item, { onSelect: e => assignCellGradeType(cell, NbGraderType.ReadonlyGraded), children: [cellGradeType === NbGraderType.ReadonlyGraded && (_jsx(ActionList.LeadingVisual, { children: _jsx(CheckIcon, {}) })), "Readonly", _jsx(ActionList.Description, { variant: "block", children: "A readonly grader cell." })] })] }), cellGradeType !== NbGraderType.NotGraded && (_jsxs(ActionList.Group, { title: "NbGrader Metadata", variant: "subtle", children: [_jsxs(ActionList.Item, { onSelect: e => e.preventDefault(), children: ["Grade ID:", ' ', _jsx(TextInput, { block: true, value: nbGrade.grade_id, onChange: e => {
111
126
  e.preventDefault();
112
127
  handleGradeIdChange(cell, e.target.value);
113
- } })] }), _jsxs(ActionList.Item, { children: ["Points:", ' ', _jsx(TextInput, { block: true, value: nbg.points, onChange: e => {
128
+ } })] }), _jsxs(ActionList.Item, { children: ["Points:", ' ', _jsx(TextInput, { block: true, value: nbGrade.points, onChange: e => {
114
129
  e.preventDefault();
115
130
  handlePointsChange(cell, e.target.value);
116
131
  } })] })] }))] }));
@@ -1 +1 @@
1
- {"version":3,"file":"CellMetadataEditor.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/metadata/CellMetadataEditor.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CellMetadataEditor.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/metadata/CellMetadataEditor.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,YAAY,EAAE,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE;IACjD,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CACzE,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC;YACT,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,EAAE;YACvC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,MAAM,mBAAmB,GAAG,CAAC,IAAsB,EAAE,OAAe,EAAE,EAAE;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;QAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;YACjC,GAAG,QAAQ;YACX,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,UAAU,CAAC;YACT,GAAG,OAAO;YACV,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,kBAAkB,GAAG,CAAC,IAAsB,EAAE,MAAc,EAAE,EAAE;QACpE,MAAM,aAAa,GAAW,CAAC,MAAM,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;YAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;gBACjC,GAAG,QAAQ;gBACX,MAAM,EAAE,aAAa;aACtB,CAAC,CAAC;YACH,UAAU,CAAC;gBACT,GAAG,OAAO;gBACV,MAAM,EAAE,aAAa;aACtB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IACF,MAAM,mBAAmB,GAAG,CAC1B,IAAsB,EACtB,aAA2B,EAC3B,EAAE;QACF,QAAQ,aAAa,EAAE;YACrB,KAAK,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC3B,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;gBACtC,gBAAgB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM;aACP;YACD,KAAK,YAAY,CAAC,gBAAgB,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;gBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;oBACjC,GAAG,QAAQ;oBACX,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,KAAK;oBACX,QAAQ,EAAE,OAAO,EAAE;oBACnB,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;gBACH,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;gBAChD,MAAM;aACP;YACD,KAAK,YAAY,CAAC,cAAc,CAAC,CAAC;gBAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;gBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;oBACjC,GAAG,QAAQ;oBACX,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,KAAK;oBACf,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,KAAK;oBACX,QAAQ,EAAE,OAAO,EAAE;oBACnB,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;gBACH,gBAAgB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC9C,MAAM;aACP;YACD,KAAK,YAAY,CAAC,oBAAoB,CAAC,CAAC;gBACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;gBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;oBACjC,GAAG,QAAQ;oBACX,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,KAAK;oBACX,QAAQ,EAAE,OAAO,EAAE;oBACnB,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;gBACH,gBAAgB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;gBACpD,MAAM;aACP;YACD,KAAK,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;gBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;oBACjC,GAAG,QAAQ;oBACX,sBAAsB;oBACtB,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,KAAK;oBACf,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,OAAO,EAAE;oBACnB,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;gBACH,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBAClD,MAAM;aACP;YACD,KAAK,YAAY,CAAC,cAAc,CAAC,CAAC;gBAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;gBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE;oBACjC,GAAG,QAAQ;oBACX,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,KAAK;oBACf,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,KAAK;iBACZ,CAAC,CAAC;gBACH,gBAAgB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC9C,MAAM;aACP;SACF;IACH,CAAC,CAAC;IACF,OAAO,CACL,MAAC,UAAU,IAAC,YAAY,mBACtB,KAAC,UAAU,CAAC,OAAO,KAAG,EACtB,MAAC,UAAU,CAAC,KAAK,IAAC,KAAK,EAAC,oBAAoB,EAAC,OAAO,EAAC,QAAQ,aAC3D,MAAC,UAAU,CAAC,IAAI,IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,aAE/D,aAAa,KAAK,YAAY,CAAC,SAAS,IAAI,CAC3C,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,UAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,mCAEd,IACT,EAClB,MAAC,UAAU,CAAC,IAAI,IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CACZ,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC,aAGzD,aAAa,KAAK,YAAY,CAAC,gBAAgB,IAAI,CAClD,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,uBAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,2CAEd,IACT,EAClB,MAAC,UAAU,CAAC,IAAI,IACd,IAAI,EAAC,UAAU,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,cAAc,CAAC,aAEnE,aAAa,KAAK,YAAY,CAAC,cAAc,IAAI,CAChD,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,qBAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,yCAEd,IACT,EAClB,MAAC,UAAU,CAAC,IAAI,IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CACZ,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,kBAAkB,CAAC,aAG3D,aAAa,KAAK,YAAY,CAAC,kBAAkB,IAAI,CACpD,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,0BAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,6CAEd,IACT,EAClB,MAAC,UAAU,CAAC,IAAI,IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CACZ,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,oBAAoB,CAAC,aAG7D,aAAa,KAAK,YAAY,CAAC,oBAAoB,IAAI,CACtD,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,4BAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,+CAEd,IACT,EAClB,MAAC,UAAU,CAAC,IAAI,IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,cAAc,CAAC,aAEpE,aAAa,KAAK,YAAY,CAAC,cAAc,IAAI,CAChD,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,SAAS,KAAG,GACY,CAC5B,cAED,KAAC,UAAU,CAAC,WAAW,IAAC,OAAO,EAAC,OAAO,wCAEd,IACT,IACD,EAClB,aAAa,KAAK,YAAY,CAAC,SAAS,IAAI,CAC3C,MAAC,UAAU,CAAC,KAAK,IAAC,KAAK,EAAC,mBAAmB,EAAC,OAAO,EAAC,QAAQ,aAC1D,MAAC,UAAU,CAAC,IAAI,IAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,0BACtC,GAAG,EAEX,KAAC,SAAS,IACR,KAAK,QACL,KAAK,EAAE,OAAO,CAAC,QAAQ,EACvB,QAAQ,EAAE,CAAC,CAAC,EAAE;oCACZ,CAAC,CAAC,cAAc,EAAE,CAAC;oCACnB,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gCAC5C,CAAC,GACD,IAEY,EAClB,MAAC,UAAU,CAAC,IAAI,0BACN,GAAG,EAET,KAAC,SAAS,IACR,KAAK,QACL,KAAK,EAAE,OAAO,CAAC,MAAM,EACrB,QAAQ,EAAE,CAAC,CAAC,EAAE;oCACZ,CAAC,CAAC,cAAc,EAAE,CAAC;oCACnB,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gCAC3C,CAAC,GACD,IAEY,IACD,CACpB,IAQU,CACd,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
@@ -82,14 +82,14 @@ export const getNbGraderType = (cell) => {
82
82
  if (!grade && solution && !locked) {
83
83
  return NbGraderType.AutogradedAnswer;
84
84
  }
85
- // Autograded test (only for code cells) { grade: true, solution: false, locked: false, points: ... }
86
- if (grade && !solution && !locked) {
87
- return NbGraderType.AutogradedTest;
88
- }
89
85
  // Manually graded task { grade: false, solution: false, locked: true, task: true, points: ... }
90
86
  if (!grade && !solution && locked && task) {
91
87
  return NbGraderType.ManuallyGradedTask;
92
88
  }
89
+ // Autograded test (only for code cells) { grade: true, solution: false, locked: true, points: ... }
90
+ if (grade && !solution && locked) {
91
+ return NbGraderType.AutogradedTest;
92
+ }
93
93
  // Manually graded answer { grade: true, solution: true, locked: false, points: ... }
94
94
  if (grade && solution && !locked) {
95
95
  return NbGraderType.ManuallyGradedAnswer;
@@ -1 +1 @@
1
- {"version":3,"file":"NbGraderCells.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/metadata/NbGraderCells.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDE;AACF,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,yDAAS,CAAA;IACT,uEAAgB,CAAA;IAChB,mEAAc,CAAA;IACd,2EAAkB,CAAA;IAClB,+EAAoB,CAAA;IACpB,mEAAc,CAAA;AAChB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAsB,EAAE,EAAE;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;IAC3D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,YAAY,CAAC,SAAS,CAAC;KAC/B;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,2FAA2F;IAC3F,IAAI,CAAC,KAAK,IAAI,QAAQ,IAAI,CAAC,MAAM,EAAE;QACjC,OAAO,YAAY,CAAC,gBAAgB,CAAC;KACtC;IACD,qGAAqG;IACrG,IAAI,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,EAAE;QACjC,OAAO,YAAY,CAAC,cAAc,CAAC;KACpC;IACD,gGAAgG;IAChG,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,IAAI,EAAE;QACzC,OAAO,YAAY,CAAC,kBAAkB,CAAC;KACxC;IACD,qFAAqF;IACrF,IAAI,KAAK,IAAI,QAAQ,IAAI,CAAC,MAAM,EAAE;QAChC,OAAO,YAAY,CAAC,oBAAoB,CAAC;KAC1C;IACD,yFAAyF;IACzF,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,CAAC,IAAI,EAAE;QAC1C,OAAO,YAAY,CAAC,cAAc,CAAC;KACpC;IACD,OAAO,YAAY,CAAC,SAAS,CAAC;AAChC,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"NbGraderCells.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/metadata/NbGraderCells.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDE;AACF,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,yDAAS,CAAA;IACT,uEAAgB,CAAA;IAChB,mEAAc,CAAA;IACd,2EAAkB,CAAA;IAClB,+EAAoB,CAAA;IACpB,mEAAc,CAAA;AAChB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAsB,EAAE,EAAE;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAQ,CAAC;IAC3D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,YAAY,CAAC,SAAS,CAAC;KAC/B;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,2FAA2F;IAC3F,IAAI,CAAC,KAAK,IAAI,QAAQ,IAAI,CAAC,MAAM,EAAE;QACjC,OAAO,YAAY,CAAC,gBAAgB,CAAC;KACtC;IACD,gGAAgG;IAChG,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,IAAI,EAAE;QACzC,OAAO,YAAY,CAAC,kBAAkB,CAAC;KACxC;IACD,oGAAoG;IACpG,IAAI,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,EAAE;QAChC,OAAO,YAAY,CAAC,cAAc,CAAC;KACpC;IACD,qFAAqF;IACrF,IAAI,KAAK,IAAI,QAAQ,IAAI,CAAC,MAAM,EAAE;QAChC,OAAO,YAAY,CAAC,oBAAoB,CAAC;KAC1C;IACD,yFAAyF;IACzF,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,CAAC,IAAI,EAAE;QAC1C,OAAO,YAAY,CAAC,cAAc,CAAC;KACpC;IACD,OAAO,YAAY,CAAC,SAAS,CAAC;AAChC,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { IOutput } from '@jupyterlab/nbformat';
2
2
  import { IOutputAreaModel } from '@jupyterlab/outputarea';
3
- import Kernel from '../../jupyter/kernel/Kernel';
4
- import OutputAdapter from './OutputAdapter';
3
+ import { Kernel } from '../../jupyter/kernel/Kernel';
4
+ import { OutputAdapter } from './OutputAdapter';
5
5
  import './Output.css';
6
6
  export type IOutputProps = {
7
7
  adapter?: OutputAdapter;
@@ -11,15 +11,16 @@ export type IOutputProps = {
11
11
  codePre?: string;
12
12
  disableRun: boolean;
13
13
  executeTrigger: number;
14
+ id: string;
14
15
  insertText?: (payload?: any) => string;
15
- kernel: Kernel;
16
+ kernel?: Kernel;
16
17
  lumino: boolean;
17
18
  model?: IOutputAreaModel;
18
19
  outputs?: IOutput[];
19
20
  receipt?: string;
20
21
  showControl?: boolean;
21
22
  showEditor: boolean;
22
- sourceId: string;
23
+ showKernelProgressBar?: boolean;
23
24
  toolbarPosition: 'up' | 'middle' | 'none';
24
25
  };
25
26
  export declare const Output: {
@@ -6,62 +6,74 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
6
6
  */
7
7
  import { useState, useEffect } from 'react';
8
8
  import { Box } from '@primer/react';
9
- import { UUID } from '@lumino/coreutils';
9
+ import { newUuid } from '../../utils';
10
10
  import { useJupyter } from '../../jupyter/JupyterContext';
11
11
  import { KernelActionMenu, KernelProgressBar } from './../kernel';
12
- import Lumino from '../lumino/Lumino';
13
- import CodeMirrorEditor from '../codemirror/CodeMirrorEditor';
14
- import OutputAdapter from './OutputAdapter';
15
- import OutputRenderer from './OutputRenderer';
16
- import { useOutputStore } from './OutputState';
12
+ import { Lumino } from '../lumino/Lumino';
13
+ import { CodeMirrorEditor } from '../codemirror/CodeMirrorEditor';
14
+ import { OutputAdapter } from './OutputAdapter';
15
+ import { OutputRenderer } from './OutputRenderer';
16
+ import { useOutputsStore } from './OutputState';
17
17
  import './Output.css';
18
18
  export const Output = (props) => {
19
- const { defaultKernel: kernel } = useJupyter();
20
- const outputStore = useOutputStore();
21
- const { adapter: propsAdapter, autoRun, clearTrigger, code, codePre, disableRun, executeTrigger, insertText, lumino, model, receipt, showControl, showEditor, sourceId, toolbarPosition, } = props;
19
+ const { defaultKernel } = useJupyter();
20
+ const outputStore = useOutputsStore();
21
+ const { adapter: propsAdapter, autoRun, clearTrigger, code, codePre, disableRun, executeTrigger, insertText, kernel: propsKernel, lumino, model, outputs: propsOutputs, receipt, showControl, showEditor, showKernelProgressBar = true, id: sourceId, toolbarPosition, } = props;
22
+ const kernel = propsKernel ?? defaultKernel;
22
23
  const [id, setId] = useState(sourceId);
23
24
  const [kernelStatus, setKernelStatus] = useState('unknown');
24
- const [outputs, setOutputs] = useState(props.outputs);
25
+ const [outputs, setOutputs] = useState(propsOutputs);
25
26
  const [adapter, setAdapter] = useState();
26
27
  useEffect(() => {
27
28
  if (!id) {
28
- setId(UUID.uuid4());
29
+ setId(newUuid());
29
30
  }
30
31
  }, []);
31
32
  useEffect(() => {
32
- if (id && kernel) {
33
- const adapter = propsAdapter ?? new OutputAdapter(kernel, outputs ?? [], model);
34
- if (receipt) {
35
- adapter.outputArea.model.changed.connect((sender, change) => {
36
- if (change.type === 'add') {
37
- change.newValues.map(val => {
38
- if (val && val.data) {
39
- const out = val.data['text/html']; // val.data['application/vnd.jupyter.stdout'];
40
- if (out) {
41
- if (out.indexOf(receipt) > -1) {
42
- outputStore.setGrade({
43
- sourceId,
44
- success: true,
45
- });
46
- }
47
- }
33
+ const outputsCallback = (model, change) => {
34
+ setOutputs(model.toJSON());
35
+ if (id) {
36
+ outputStore.setModel(id, model);
37
+ }
38
+ };
39
+ const receiptCallback = (model, change) => {
40
+ if (receipt && change.type === 'add') {
41
+ change.newValues.map(val => {
42
+ if (val && val.data) {
43
+ const out = val.data['text/html']; // val.data['application/vnd.jupyter.stdout'];
44
+ if (out) {
45
+ if (out.indexOf(receipt) > -1) {
46
+ outputStore.setGradeSuccess(sourceId, true);
48
47
  }
49
- });
48
+ }
50
49
  }
51
50
  });
52
51
  }
52
+ };
53
+ if (id && kernel) {
54
+ const adapter = propsAdapter ?? new OutputAdapter(id, kernel, outputs ?? [], model);
53
55
  setAdapter(adapter);
54
- outputStore.setAdapter(sourceId, adapter);
55
- adapter.outputArea.model.changed.connect((outputModel, args) => {
56
- setOutputs(outputModel.toJSON());
57
- });
56
+ outputStore.setAdapter(id, adapter);
57
+ if (model) {
58
+ outputStore.setModel(id, model);
59
+ }
60
+ if (code) {
61
+ outputStore.setInput(id, code);
62
+ }
63
+ adapter.outputArea.model.changed.connect(outputsCallback);
64
+ if (receipt) {
65
+ adapter.outputArea.model.changed.connect(receiptCallback);
66
+ }
58
67
  }
68
+ return () => {
69
+ if (adapter) {
70
+ adapter.outputArea.model.changed.disconnect(outputsCallback);
71
+ adapter.outputArea.model.changed.disconnect(receiptCallback);
72
+ }
73
+ };
59
74
  }, [id, kernel]);
60
75
  useEffect(() => {
61
76
  if (adapter) {
62
- if (!adapter.kernel) {
63
- adapter.kernel = kernel;
64
- }
65
77
  if (autoRun) {
66
78
  adapter.execute(code);
67
79
  }
@@ -80,10 +92,10 @@ export const Output = (props) => {
80
92
  };
81
93
  }
82
94
  }, [kernel]);
83
- const executeRequest = outputStore.getExecute(sourceId);
95
+ const executeRequest = outputStore.getExecuteRequest(sourceId);
84
96
  useEffect(() => {
85
- if (adapter && executeRequest && executeRequest.sourceId === id) {
86
- adapter.execute(executeRequest.source);
97
+ if (adapter && executeRequest && executeRequest === id) {
98
+ adapter.execute(code);
87
99
  }
88
100
  }, [executeRequest, adapter]);
89
101
  useEffect(() => {
@@ -100,7 +112,7 @@ export const Output = (props) => {
100
112
  '& .cm-editor': {
101
113
  borderRadius: '5px',
102
114
  },
103
- }, children: _jsx(CodeMirrorEditor, { autoRun: autoRun, code: code, codePre: codePre, disableRun: disableRun, insertText: insertText, kernel: kernel, outputAdapter: adapter, sourceId: id, toolbarPosition: toolbarPosition }) })), adapter && (_jsxs(Box, { display: "flex", children: [_jsx(Box, { flexGrow: 1, children: kernelStatus !== 'idle' && _jsx(KernelProgressBar, {}) }), showControl && (_jsx(Box, { style: { marginTop: '-13px' }, children: _jsx(KernelActionMenu, { kernel: kernel, outputAdapter: adapter }) }))] })), outputs && (_jsx(Box, { sx: {
115
+ }, children: _jsx(CodeMirrorEditor, { autoRun: autoRun, code: code, codePre: codePre, disableRun: disableRun, insertText: insertText, kernel: kernel, outputAdapter: adapter, sourceId: id, toolbarPosition: toolbarPosition }) })), adapter && (_jsxs(Box, { display: "flex", children: [_jsx(Box, { flexGrow: 1, children: kernelStatus !== 'idle' && showKernelProgressBar && _jsx(KernelProgressBar, {}) }), showControl && (_jsx(Box, { style: { marginTop: '-13px' }, children: _jsx(KernelActionMenu, { kernel: kernel, outputAdapter: adapter }) }))] })), outputs && (_jsx(Box, { sx: {
104
116
  '& .jp-OutputArea': {
105
117
  fontSize: '10px',
106
118
  },
@@ -124,6 +136,7 @@ export const Output = (props) => {
124
136
  }) })) }))] }));
125
137
  };
126
138
  Output.defaultProps = {
139
+ autoRun: false,
127
140
  clearTrigger: 0,
128
141
  disableRun: false,
129
142
  executeTrigger: 0,
@@ -1 +1 @@
1
- {"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/output/Output.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAIzC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,cAAc,CAAC;AAsBtB,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC5C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,EACJ,OAAO,EAAE,YAAY,EACrB,OAAO,EACP,YAAY,EACZ,IAAI,EACJ,OAAO,EACP,UAAU,EACV,cAAc,EACd,UAAU,EACV,MAAM,EACN,KAAK,EACL,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,EACR,eAAe,GAChB,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAqB,QAAQ,CAAC,CAAC;IAC3D,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GACnC,QAAQ,CAAuB,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAwB,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IACxD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,EAAE,EAAE;YACP,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SACrB;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,EAAE,IAAI,MAAM,EAAE;YAChB,MAAM,OAAO,GACX,YAAY,IAAI,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YAClE,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;oBAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;wBACzB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4BACzB,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE;gCACnB,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,8CAA8C;gCACjF,IAAI,GAAG,EAAE;oCACP,IAAK,GAAc,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;wCACzC,WAAW,CAAC,QAAQ,CAAC;4CACnB,QAAQ;4CACR,OAAO,EAAE,IAAI;yCACd,CAAC,CAAC;qCACJ;iCACF;6BACF;wBACH,CAAC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,UAAU,CAAC,OAAO,CAAC,CAAC;YACpB,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1C,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;gBAC7D,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IACjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACnB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;aACzB;YACD,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrB,eAAe,CAAC,MAAM,CAAC,UAAW,CAAC,MAAM,CAAC,CAAC;gBAC3C,MAAM,CAAC,UAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE;oBACpE,eAAe,CAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,EAAE;gBACV,6GAA6G;YAC/G,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,cAAc,IAAI,cAAc,CAAC,QAAQ,KAAK,EAAE,EAAE;YAC/D,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACxC;IACH,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,cAAc,GAAG,CAAC,EAAE;YACjC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACvB;IACH,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IACrB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,YAAY,GAAG,CAAC,EAAE;YAC/B,OAAO,CAAC,KAAK,EAAE,CAAC;SACjB;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5B,OAAO,CACL,8BACG,UAAU,IAAI,OAAO,IAAI,EAAE,IAAI,CAC9B,KAAC,GAAG,IACF,EAAE,EAAE;oBACF,cAAc,EAAE;wBACd,YAAY,EAAE,KAAK;qBACpB;iBACF,YAED,KAAC,gBAAgB,IACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,EACtB,QAAQ,EAAE,EAAE,EACZ,eAAe,EAAE,eAAe,GAChC,GACE,CACP,EACA,OAAO,IAAI,CACV,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,aACjB,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YACb,YAAY,KAAK,MAAM,IAAI,KAAC,iBAAiB,KAAG,GAC7C,EACL,WAAW,IAAI,CACd,KAAC,GAAG,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,YAChC,KAAC,gBAAgB,IAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAI,GACxD,CACP,IACG,CACP,EACA,OAAO,IAAI,CACV,KAAC,GAAG,IACF,EAAE,EAAE;oBACF,kBAAkB,EAAE;wBAClB,QAAQ,EAAE,MAAM;qBACjB;oBACD,oBAAoB,EAAE;oBACpB,gCAAgC;qBACjC;oBACD,yBAAyB,EAAE;wBACzB,OAAO,EAAE,MAAM;wBACf,6BAA6B;qBAC9B;oBACD,OAAO,EAAE;wBACP,QAAQ,EAAE,MAAM;wBAChB,SAAS,EAAE,WAAW;wBACtB,QAAQ,EAAE,YAAY;wBACtB,UAAU,EAAE,UAAU;qBACvB;iBACF,YAEA,MAAM;oBACL,CAAC,CAAC,OAAO,IAAI,KAAC,MAAM,cAAE,OAAO,CAAC,UAAU,GAAU;oBAClD,CAAC,CAAC,OAAO,IAAI,CACT,4BACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAe,EAAE,EAAE;4BAC/B,OAAO,KAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC;wBAC5C,CAAC,CAAC,GACD,CACJ,GACD,CACP,IACA,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,YAAY,GAAG;IACpB,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE;QACP;YACE,WAAW,EAAE,gBAAgB;YAC7B,IAAI,EAAE;gBACJ,WAAW,EAAE;oBACX,0DAA0D;iBAC3D;aACF;YACD,eAAe,EAAE,CAAC;YAClB,QAAQ,EAAE,EAAE;SACb;KACF;IACD,eAAe,EAAE,IAAI;CACG,CAAC;AAE3B,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/output/Output.tsx"],"names":[],"mappings":"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"}
@@ -1,13 +1,14 @@
1
1
  import { IOutput } from '@jupyterlab/nbformat';
2
2
  import { IOutputAreaModel, OutputArea } from '@jupyterlab/outputarea';
3
- import Kernel from '../../jupyter/kernel/Kernel';
3
+ import { Kernel } from '../../jupyter/kernel/Kernel';
4
4
  export declare class OutputAdapter {
5
+ private _id;
5
6
  private _kernel?;
6
7
  private _renderers;
7
8
  private _outputArea;
8
9
  private _rendermime;
9
10
  private _iPyWidgetsClassicManager;
10
- constructor(kernel?: Kernel, outputs?: IOutput[], outputAreaModel?: IOutputAreaModel);
11
+ constructor(id: string, kernel?: Kernel, outputs?: IOutput[], outputAreaModel?: IOutputAreaModel);
11
12
  execute(code: string): Promise<void>;
12
13
  interrupt(): void;
13
14
  clear(): void;
@@ -3,20 +3,23 @@
3
3
  *
4
4
  * MIT License
5
5
  */
6
- import { OutputArea, OutputAreaModel, } from '@jupyterlab/outputarea';
7
- import { RenderMimeRegistry, standardRendererFactories, } from '@jupyterlab/rendermime';
6
+ import { OutputArea, OutputAreaModel } from '@jupyterlab/outputarea';
7
+ import { RenderMimeRegistry, standardRendererFactories } from '@jupyterlab/rendermime';
8
8
  import { rendererFactory as jsonRendererFactory } from '@jupyterlab/json-extension';
9
9
  import { rendererFactory as javascriptRendererFactory } from '@jupyterlab/javascript-extension';
10
- import { WIDGET_MIMETYPE, WidgetRenderer, } from '@jupyter-widgets/html-manager/lib/output_renderers';
10
+ import { WIDGET_MIMETYPE, WidgetRenderer } from '@jupyter-widgets/html-manager/lib/output_renderers';
11
11
  import { requireLoader as loader } from '../../jupyter/ipywidgets/libembed-amd';
12
12
  import { ClassicWidgetManager } from '../../jupyter/ipywidgets/classic/manager';
13
+ import { execute } from './OutputExecutor';
13
14
  export class OutputAdapter {
15
+ _id;
14
16
  _kernel;
15
17
  _renderers;
16
18
  _outputArea;
17
19
  _rendermime;
18
20
  _iPyWidgetsClassicManager;
19
- constructor(kernel, outputs, outputAreaModel) {
21
+ constructor(id, kernel, outputs, outputAreaModel) {
22
+ this._id = id;
20
23
  this._kernel = kernel;
21
24
  this._renderers = standardRendererFactories.filter(factory => factory.mimeTypes[0] !== 'text/javascript');
22
25
  this._renderers.push(jsonRendererFactory);
@@ -60,8 +63,8 @@ export class OutputAdapter {
60
63
  async execute(code) {
61
64
  if (this._kernel) {
62
65
  this.clear();
63
- await this._kernel?.execute(code, { model: this._outputArea.model })
64
- ?.done;
66
+ const done = execute(this._id, code, this._outputArea, this._kernel);
67
+ await done;
65
68
  }
66
69
  }
67
70
  interrupt() {
@@ -1 +1 @@
1
- {"version":3,"file":"OutputAdapter.js","sourceRoot":"","sources":["../../../src/components/output/OutputAdapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OutputAdapter.js","sourceRoot":"","sources":["../../../src/components/output/OutputAdapter.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import { JSONObject } from '@lumino/coreutils';
2
+ import { KernelMessage } from '@jupyterlab/services';
3
+ import { OutputArea } from '@jupyterlab/outputarea';
4
+ import { Kernel } from './../../jupyter/kernel/Kernel';
5
+ /**
6
+ * Execute code on an output area.
7
+ */
8
+ export declare function execute(id: string, code: string, output: OutputArea, kernel: Kernel, metadata?: JSONObject): Promise<KernelMessage.IExecuteReplyMsg | undefined>;
@@ -0,0 +1,28 @@
1
+ /*
2
+ * Copyright (c) 2021-2023 Datalayer, Inc.
3
+ *
4
+ * MIT License
5
+ */
6
+ /**
7
+ * Execute code on an output area.
8
+ */
9
+ export async function execute(id, code, output, kernel, metadata) {
10
+ // Override the default for `stop_on_error`.
11
+ let stopOnError = true;
12
+ if (metadata &&
13
+ Array.isArray(metadata.tags) &&
14
+ metadata.tags.indexOf('raises-exception') !== -1) {
15
+ stopOnError = false;
16
+ }
17
+ const kernelExecutor = kernel.execute(code, {
18
+ model: output.model,
19
+ stopOnError,
20
+ });
21
+ const future = kernelExecutor.future;
22
+ // TODO fix in upstream jupyterlab if possible...
23
+ output._onIOPub = future.onIOPub;
24
+ output._onExecuteReply = future.onReply;
25
+ output.future = future;
26
+ return future?.done;
27
+ }
28
+ //# sourceMappingURL=OutputExecutor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"OutputExecutor.js","sourceRoot":"","sources":["../../../src/components/output/OutputExecutor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,EAAU,EACV,IAAY,EACZ,MAAkB,EAClB,MAAc,EACd,QAAqB;IAErB,4CAA4C;IAC5C,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IACE,QAAQ;QACR,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC5B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAChD;QACA,WAAW,GAAG,KAAK,CAAC;KACrB;IACD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CACnC,IAAI,EACJ;QACE,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,WAAW;KACZ,CACF,CAAC;IACF,MAAM,MAAM,GAAG,cAAe,CAAC,MAAM,CAAC;IACtC,iDAAiD;IAChD,MAAc,CAAC,QAAQ,GAAG,MAAO,CAAC,OAAO,CAAC;IAC1C,MAAc,CAAC,eAAe,GAAG,MAAO,CAAC,OAAO,CAAC;IAClD,MAAM,CAAC,MAAM,GAAG,MAAO,CAAC;IACxB,OAAO,MAAM,EAAE,IAAI,CAAC;AACtB,CAAC"}