@difizen/libro-jupyter 0.3.53 → 0.3.55

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 (7) hide show
  1. package/es/cell/jupyter-code-cell-view.d.ts.map +1 -1
  2. package/es/cell/jupyter-code-cell-view.js +2 -5
  3. package/es/utils/index.d.ts.map +1 -1
  4. package/es/utils/index.js +11 -2
  5. package/package.json +17 -17
  6. package/src/cell/jupyter-code-cell-view.tsx +2 -4
  7. package/src/utils/index.ts +14 -5
package/es/cell/jupyter-code-cell-view.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAGO,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAU5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA4FnB"}
1
+ {"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAGO,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAU5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA0FnB"}
package/es/cell/jupyter-code-cell-view.js CHANGED
@@ -237,7 +237,6 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
237
237
  key: "run",
238
238
  value: function () {
239
239
  var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
240
- var _this3 = this;
241
240
  var libroModel, kernelConnection, cellContent, cellModel, future, startTimeStr, msgPromise, endTimeStr;
242
241
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
243
242
  while (1) switch (_context4.prev = _context4.next) {
@@ -266,8 +265,7 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
266
265
  cellModel.metadata.execution = {};
267
266
  }
268
267
  cellModel.metadata.execution['libro_execution_msg_id'] = future.msg.header.msg_id;
269
- // 触发保存
270
- this.parent.model.saveNotebookContent();
268
+ cellModel.metadata = _objectSpread({}, cellModel.metadata);
271
269
 
272
270
  // Handle iopub messages
273
271
  future.onIOPub = function (msg) {
@@ -278,8 +276,7 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
278
276
  to_execute: new Date().toISOString(),
279
277
  libro_execution_msg_id: future.msg.header.msg_id
280
278
  };
281
- // 触发保存
282
- _this3.parent.model.saveNotebookContent();
279
+ cellModel.metadata = _objectSpread({}, cellModel.metadata);
283
280
  cellModel.kernelExecuting = true;
284
281
  startTimeStr = msg.header.date;
285
282
  var meta = cellModel.metadata.execution;
package/es/utils/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,8BAA8B,CAAC;AAOtC,eAAO,MAAM,aAAa,eAAe,CAAC;AAC1C,eAAO,MAAM,mBAAmB,gCAAgC,CAAC;AACjE,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAE7D,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,eAAO,MAAM,gBAAgB,UAAW,SAAS,YAIhD,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAgBhD;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,SAAS,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAgBpC;AAED,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAMpE;AAED,eAAO,MAAM,oBAAoB,kBAChB,aAAa,GAAG,SAAS,cAC5B,iBAAiB,GAAG,SAAS,KACxC,YAwBF,CAAC;AAGF,eAAO,MAAM,cAAc,uBACL,aAAa,cACrB,iBAAiB,GAAG,SAAS,YAW1C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAQjE,eAAO,MAAM,aAAa,eAAe,CAAC;AAC1C,eAAO,MAAM,mBAAmB,gCAAgC,CAAC;AACjE,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAE7D,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,eAAO,MAAM,gBAAgB,UAAW,SAAS,YAIhD,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAgBhD;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,SAAS,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAgBpC;AAED,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAMpE;AAED,eAAO,MAAM,oBAAoB,kBAChB,aAAa,GAAG,SAAS,cAC5B,iBAAiB,GAAG,SAAS,KACxC,YAmCF,CAAC;AAGF,eAAO,MAAM,cAAc,uBACL,aAAa,cACrB,iBAAiB,GAAG,SAAS,YAW1C,CAAC"}
package/es/utils/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { l10n } from '@difizen/mana-l10n';
2
2
  import { duration } from 'moment';
3
3
  import { LibroJupyterModel } from "../libro-jupyter-model.js";
4
- import { jupyterServiceStatus, kernelStatus, statusToColor } from "../libro-jupyter-protocol.js";
4
+ import { jupyterServiceStatus, kernelStatus, statusToColor, ExecutedWithKernelCellModel } from "../libro-jupyter-protocol.js";
5
5
  export var EXECUTE_INPUT = 'to_execute'; // 用户点击执行按钮的时间
6
6
  export var EXECUTE_REPLY_START = 'shell.execute_reply.started'; // Kernel 开始执行任务时间在 metadata 中的 key
7
7
  export var EXECUTE_REPLY_REPLY = 'shell.execute_reply.end'; // Kernel 结束执行任务时间在 metadata 中的 key
@@ -63,7 +63,16 @@ export var getServiceStatusInfo = function getServiceStatusInfo(serverManager, l
63
63
  text_zh: l10n.t('无内核')
64
64
  };
65
65
  }
66
- return kernelStatus[libroModel.kernelConnection.status];
66
+ var status = libroModel.kernelConnection.status;
67
+ if (status === 'unknown') {
68
+ var hasRunningCell = libroModel.cells.some(function (cell) {
69
+ return ExecutedWithKernelCellModel.is(cell.model) && cell.model.kernelExecuting;
70
+ });
71
+ if (hasRunningCell) {
72
+ status = 'busy';
73
+ }
74
+ }
75
+ return kernelStatus[status];
67
76
  };
68
77
 
69
78
  // 判断服务未启动、kernel正在连接 -> return false
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@difizen/libro-jupyter",
3
- "version": "0.3.53",
3
+ "version": "0.3.55",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "libro"
@@ -37,22 +37,22 @@
37
37
  "dependencies": {
38
38
  "@ant-design/colors": "^7.0.0",
39
39
  "@ant-design/icons": "^5.1.0",
40
- "@difizen/libro-code-cell": "^0.3.53",
41
- "@difizen/libro-code-editor": "^0.3.53",
42
- "@difizen/libro-codemirror": "^0.3.53",
43
- "@difizen/libro-cofine-editor": "^0.3.53",
44
- "@difizen/libro-common": "^0.3.53",
45
- "@difizen/libro-core": "^0.3.53",
46
- "@difizen/libro-kernel": "^0.3.53",
47
- "@difizen/libro-l10n": "^0.3.53",
48
- "@difizen/libro-language-client": "^0.3.53",
49
- "@difizen/libro-lsp": "^0.3.53",
50
- "@difizen/libro-markdown-cell": "^0.3.53",
51
- "@difizen/libro-output": "^0.3.53",
52
- "@difizen/libro-raw-cell": "^0.3.53",
53
- "@difizen/libro-rendermime": "^0.3.53",
54
- "@difizen/libro-search": "^0.3.53",
55
- "@difizen/libro-search-code-cell": "^0.3.53",
40
+ "@difizen/libro-code-cell": "^0.3.55",
41
+ "@difizen/libro-code-editor": "^0.3.55",
42
+ "@difizen/libro-codemirror": "^0.3.55",
43
+ "@difizen/libro-cofine-editor": "^0.3.55",
44
+ "@difizen/libro-common": "^0.3.55",
45
+ "@difizen/libro-core": "^0.3.55",
46
+ "@difizen/libro-kernel": "^0.3.55",
47
+ "@difizen/libro-l10n": "^0.3.55",
48
+ "@difizen/libro-language-client": "^0.3.55",
49
+ "@difizen/libro-lsp": "^0.3.55",
50
+ "@difizen/libro-markdown-cell": "^0.3.55",
51
+ "@difizen/libro-output": "^0.3.55",
52
+ "@difizen/libro-raw-cell": "^0.3.55",
53
+ "@difizen/libro-rendermime": "^0.3.55",
54
+ "@difizen/libro-search": "^0.3.55",
55
+ "@difizen/libro-search-code-cell": "^0.3.55",
56
56
  "@difizen/mana-app": "latest",
57
57
  "@difizen/mana-l10n": "latest",
58
58
  "classnames": "^2.3.2",
package/src/cell/jupyter-code-cell-view.tsx CHANGED
@@ -210,8 +210,7 @@ export class JupyterCodeCellView extends LibroCodeCellView {
210
210
  }
211
211
  (cellModel.metadata.execution as any)['libro_execution_msg_id'] =
212
212
  future.msg.header.msg_id;
213
- // 触发保存
214
- this.parent.model.saveNotebookContent();
213
+ cellModel.metadata = { ...cellModel.metadata };
215
214
 
216
215
  // Handle iopub messages
217
216
  future.onIOPub = (msg: any) => {
@@ -222,8 +221,7 @@ export class JupyterCodeCellView extends LibroCodeCellView {
222
221
  to_execute: new Date().toISOString(),
223
222
  libro_execution_msg_id: future.msg.header.msg_id,
224
223
  } as ExecutionMeta;
225
- // 触发保存
226
- this.parent.model.saveNotebookContent();
224
+ cellModel.metadata = { ...cellModel.metadata };
227
225
  cellModel.kernelExecuting = true;
228
226
  startTimeStr = msg.header.date as string;
229
227
  const meta = cellModel.metadata.execution as ExecutionMeta;
package/src/utils/index.ts CHANGED
@@ -4,14 +4,12 @@ import { l10n } from '@difizen/mana-l10n';
4
4
  import { duration } from 'moment';
5
5
 
6
6
  import { LibroJupyterModel } from '../libro-jupyter-model.js';
7
- import type {
8
- ExecutedWithKernelCellModel,
9
- ServerStatus,
10
- } from '../libro-jupyter-protocol.js';
7
+ import type { ServerStatus } from '../libro-jupyter-protocol.js';
11
8
  import {
12
9
  jupyterServiceStatus,
13
10
  kernelStatus,
14
11
  statusToColor,
12
+ ExecutedWithKernelCellModel,
15
13
  } from '../libro-jupyter-protocol.js';
16
14
 
17
15
  export const EXECUTE_INPUT = 'to_execute'; // 用户点击执行按钮的时间
@@ -100,7 +98,18 @@ export const getServiceStatusInfo = (
100
98
  };
101
99
  }
102
100
 
103
- return kernelStatus[libroModel.kernelConnection.status];
101
+ let status = libroModel.kernelConnection.status;
102
+
103
+ if (status === 'unknown') {
104
+ const hasRunningCell = libroModel.cells.some((cell) => {
105
+ return ExecutedWithKernelCellModel.is(cell.model) && cell.model.kernelExecuting;
106
+ });
107
+ if (hasRunningCell) {
108
+ status = 'busy';
109
+ }
110
+ }
111
+
112
+ return kernelStatus[status];
104
113
  };
105
114
 
106
115
  // 判断服务未启动、kernel正在连接 -> return false