@difizen/libro-jupyter 0.1.17 → 0.1.19

package/src/file/file-view/index.tsx

@@ -1,4 +1,6 @@
 import { ExclamationCircleFilled, FolderFilled } from '@ant-design/icons';
+import { ContentsManager } from '@difizen/libro-kernel';
+import type { IContentsModel } from '@difizen/libro-kernel';
 import type { TreeNode, ViewOpenHandler } from '@difizen/mana-app';
 import { FileTreeViewFactory } from '@difizen/mana-app';
 import {
@@ -39,7 +41,9 @@ const noVerifyFileType = ['.ipynb', '.py'];
 @view(FileTreeViewFactory, FileTreeModule)
 export class FileView extends FileTreeView {
   @inject(OpenerService) protected openService: OpenerService;
+  @inject(ContentsManager) protected contentsManager: ContentsManager;
   @inject(CommandRegistry) protected command: CommandRegistry;
+  uploadInput?: HTMLInputElement;
   override id = FileTreeViewFactory;
   override className = 'libro-jupyter-file-tree';
 
@@ -64,6 +68,92 @@ export class FileView extends FileTreeView {
     this.toDispose.push(this.model.onOpenNode(this.openNode));
   }
 
+  override onViewMount(): void {
+    super.onViewMount?.();
+    if (!this.container?.current) {
+      return;
+    }
+    const container = this.container.current;
+    const input = document.createElement('input');
+    input.type = 'file';
+    input.multiple = true;
+    input.onclick = this.onInputClicked;
+    input.onchange = this.onInputChanged;
+    input.style.display = 'none';
+    container.appendChild(input);
+    this.uploadInput = input;
+  }
+
+  uploadSubmit = (basePath?: string) => {
+    if (this.uploadInput) {
+      this.uploadInput.setAttribute('data-path', basePath || '');
+      this.uploadInput.click();
+    }
+  };
+  /**
+   * Perform the actual upload.
+   */
+  protected async doUpload(file: File, basePath: string): Promise<IContentsModel> {
+    // Gather the file model parameters.
+    let path = basePath;
+    path = path ? path + '/' + file.name : file.name;
+    const name = file.name;
+    const type = 'file';
+    const format = 'base64';
+
+    const uploadInner = async (blob: Blob, chunk?: number): Promise<IContentsModel> => {
+      const reader = new FileReader();
+      reader.readAsDataURL(blob);
+      await new Promise((resolve, reject) => {
+        reader.onload = resolve;
+        reader.onerror = (event) => reject(`Failed to upload "${file.name}":` + event);
+      });
+
+      // remove header https://stackoverflow.com/a/24289420/907060
+      const content = (reader.result as string).split(',')[1];
+
+      const model: Partial<IContentsModel> = {
+        type,
+        format,
+        name,
+        chunk,
+        content,
+      };
+      return await this.contentsManager.save(path, model);
+    };
+
+    return await uploadInner(file);
+  }
+
+  onInputChanged = () => {
+    if (!this.uploadInput) {
+      return;
+    }
+    let path = this.uploadInput.getAttribute('data-path') || '';
+    if (!path) {
+      path = this.model.location?.path.toString() || '';
+    }
+    if (!path) {
+      return;
+    }
+    const files = Array.prototype.slice.call(this.uploadInput.files) as File[];
+    const pending = files.map((file) => this.doUpload(file, path));
+    Promise.all(pending)
+      .then(() => {
+        this.model.refresh();
+        return;
+      })
+      .catch((error) => {
+        console.error('Upload Error:', error);
+      });
+  };
+
+  onInputClicked = () => {
+    if (this.uploadInput) {
+      this.uploadInput.value = '';
+    }
+  };
+
   openNode = async (treeNode: TreeNode) => {
     if (FileStatNode.is(treeNode) && !treeNode.fileStat.isDirectory) {
       if (

package/src/file/navigatable-view.tsx

@@ -141,7 +141,7 @@ export class LibroNavigatableView
       return;
     }
     this.libroView = libroView;
-    this.libroView.model.onContentChanged(() => {
+    this.libroView.model.onChanged(() => {
       this.dirty = true;
       this.dirtyEmitter.fire();
       if (this.autoSave === 'on') {

package/src/libro-jupyter-model.ts

@@ -3,6 +3,7 @@ import type { VirtualizedManager } from '@difizen/libro-core';
 import {
   ContentsManager,
   ExecutableNotebookModel,
+  isDisplayDataMsg,
   LibroKernelConnectionManager,
   ServerConnection,
   ServerManager,
@@ -16,6 +17,7 @@ import { l10n } from '@difizen/mana-l10n';
 
 import {
   ExecutedWithKernelCellModel,
+  libroArgsMimetype,
   LibroFileService,
 } from './libro-jupyter-protocol.js';
 import { SaveFileErrorModal } from './toolbar/save-file-error.js';
@@ -81,6 +83,21 @@ export class LibroJupyterModel extends LibroModel implements ExecutableNotebookM
     this.modalService = modalService;
     this.dndAreaNullEnable = true;
     this.virtualizedManager = virtualizedManagerHelper.getOrCreate(this);
+    this.kcReady
+      .then(() => {
+        this.kernelConnection?.futureMessage((msg) => {
+          if (isDisplayDataMsg(msg) && libroArgsMimetype in msg.content.data) {
+            this.metadata = {
+              ...this.metadata,
+              args: msg.content.data[libroArgsMimetype],
+            };
+          }
+        });
+        return;
+      })
+      .catch(() => {
+        return;
+      });
   }
 
   get isKernelIdle() {

package/src/libro-jupyter-protocol.ts

@@ -57,3 +57,5 @@ export const ServerLaunchManager = Symbol('ServerLaunchManager');
 export interface ServerLaunchManager {
   launch: () => Promise<any>;
 }
+
+export const libroArgsMimetype = 'application/vnd.libro.args+json';

package/src/libro-jupyter-view.tsx

@@ -5,10 +5,13 @@ import { LibroView, notebookViewFactoryId } from '@difizen/libro-core';
 import { URI, view, ViewOption } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 
+import type { LibroJupyterModel } from './libro-jupyter-model.js';
+
 @transient()
 @view(notebookViewFactoryId)
 export class LibroJupyterView extends LibroView {
   uri: URI;
+  declare model: LibroJupyterModel;
   constructor(
     @inject(ViewOption) options: NotebookOption,
     @inject(CollapseServiceFactory) collapseServiceFactory: CollapseServiceFactory,

package/src/module.ts

@@ -15,7 +15,7 @@ import {
   LibroToolbarModule,
 } from '@difizen/libro-core';
 import { LibroKernelManageModule } from '@difizen/libro-kernel';
-import { LibroLSPModule } from '@difizen/libro-lsp';
+import { LibroLanguageClientModule } from '@difizen/libro-language-client';
 import { MarkdownCellModule } from '@difizen/libro-markdown-cell';
 import {
   DisplayDataOutputModule,
@@ -102,7 +102,6 @@ export const LibroJupyterModule = ManaModule.create()
     LibroSearchModule,
     SearchCodeCellModule,
     LibroAddCellModule,
-    LibroLSPModule,
     LibroE2EditorModule,
     CodeMirrorEditorModule,
     // custom module
@@ -110,4 +109,5 @@ export const LibroJupyterModule = ManaModule.create()
     KeybindInstructionsModule,
     PlotlyModule,
     LibroJupyterFileModule,
+    LibroLanguageClientModule,
   );