chore: custom service manager

Author: echarles

.gitignore

@@ -169,6 +169,5 @@ packages/*/content
 !.storybook
 !.vscode
 !.licenserc.yaml
-!**/static/README.md
+!packages/react/jupyter_react/static/README.md
 !docs/static/img
-!**/jupyter_react/static/README.md

packages/react/jupyter_react/static/README.md

@@ -3,7 +3,7 @@
 # MIT License
 
 [build-system]
-requires = ["hatchling==1.21.1", "jupyterlab==4.1.0b0", "hatch-nodejs-version"]
+requires = ["hatchling==1.21.1", "jupyterlab==4.0.9", "hatch-nodejs-version"]
 build-backend = "hatchling.build"
 
 [project]

packages/react/pyproject.toml

@@ -41,7 +41,7 @@ class ConsoleAdapter {
     });
   }
 
-  protected setupConsole(serviceManager: ServiceManager, kernel?: Kernel) {
+  protected setupConsole(serviceManager: ServiceManager.IManager, kernel?: Kernel) {
     // Set up a command registry.
     const commands = new CommandRegistry();
     this._panel.node.addEventListener('keydown', event => {
@@ -184,7 +184,7 @@ export namespace ConsoleAdapter {
     /**
      * Application service manager
      */
-    serviceManager: ServiceManager;
+    serviceManager: ServiceManager.IManager;
     /**
      * Initial code to run.
      */

packages/react/src/components/console/ConsoleAdapter.ts

@@ -79,7 +79,7 @@ export const FileBrowser = () => {
   };
   useEffect(() => {
     if (serviceManager) {
-      const services = new Services(serviceManager!);
+      const services = new Services(serviceManager);
       loadPath(services, initialTree, []);
     }
   }, [serviceManager]);

packages/react/src/components/filebrowser/FileBrowser.tsx

@@ -26,7 +26,7 @@ import './FileManagerAdapter.css';
 class FileBrowserAdapter {
   private _fileBrowserPanel: SplitPanel;
 
-  constructor(serviceManager: ServiceManager) {
+  constructor(serviceManager: ServiceManager.IManager) {
     this._fileBrowserPanel = new SplitPanel();
     this._fileBrowserPanel.id = 'dla-jlab-FleBrowser';
     this._fileBrowserPanel.orientation = 'horizontal';

packages/react/src/components/filemanager/lab/FileManagerAdapter.ts

@@ -9,6 +9,7 @@ import { Box } from '@primer/react';
 import { JupyterLab } from '@jupyterlab/application';
 import { PageConfig } from '@jupyterlab/coreutils';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
+import { ServiceManager } from '@jupyterlab/services';
 import { useJupyter } from '../../jupyter/JupyterContext';
 import { ColorMode } from '../../jupyter/lab/JupyterLabColorMode';
 import { JupyterLabAppCorePlugins } from './JupyterLabAppPlugins';
@@ -22,39 +23,46 @@ import JupyterLabAppCss from './JupyterLabAppCss';
   PageConfig.getOption('fullStaticUrl') + '/';
 
 export type JupyterLabAppProps = {
+  PluginType?: any;
   devMode: boolean;
-  headless: boolean;
-  pluginPromises?: Array<Promise<JupyterLab.IPluginModule>>;
-  plugins: Array<JupyterLab.IPluginModule>;
   disabledPlugins: Array<string>;
+  headless: boolean;
+  height: string | number;
+  hostId: string;
   mimeRendererPromises?: Array<Promise<IRenderMime.IExtensionModule>>;
   mimeRenderers: Array<IRenderMime.IExtensionModule>;
-  onPlugin?: (plugin: any) => void;
   onJupyterLab: (jupyterLabAppdapter: JupyterLabAppAdapter) => void;
-  height: string | number;
-  hostId: string;
+  onPlugin?: (plugin: any) => void;
   pluginId?: string;
-  PluginType?: any;
+  pluginPromises?: Array<Promise<JupyterLab.IPluginModule>>;
+  plugins: Array<JupyterLab.IPluginModule>;
   position: string;
+  serviceManager: ServiceManager.IManager;
   splash: boolean;
+  startDefaultKernel: boolean;
   theme: ColorMode;
   width: string | number;
 };
 
 const JupyterLabAppComponent = (props: JupyterLabAppProps) => {
   const {
-    hostId,
-    position,
-    height,
-    width,
+    PluginType,
     headless,
-    theme,
+    height,
+    hostId,
     onJupyterLab,
-    pluginId,
-    PluginType,
     onPlugin,
+    pluginId,
+    position,
+    serviceManager: propsServiceManager,
+    startDefaultKernel,
+    theme,
+    width,
   } = props;
-  const { serviceManager, collaborative } = useJupyter();
+  const { serviceManager, collaborative } = useJupyter({
+    serviceManager: propsServiceManager,
+    startDefaultKernel,
+  });
   const defaultMimeExtensionPromises = useMemo(
     () =>
       props.mimeRendererPromises ??
@@ -110,15 +118,16 @@ const JupyterLabAppComponent = (props: JupyterLabAppProps) => {
 
 JupyterLabAppComponent.defaultProps = {
   devMode: false,
-  plugins: [],
   disabledPlugins: [],
-  mimeRenderers: [],
   headless: false,
   height: '100vh',
   hostId: 'app-example-id',
-  onJupyterLab: (jupyterLabAppAdapter: JupyterLabAppAdapter) => {},
+  mimeRenderers: [],
+  onJupyterLab: (_: JupyterLabAppAdapter) => {},
+  plugins: [],
   position: 'relative',
   splash: true,
+  startDefaultKernel: false,
   theme: 'light',
   width: '100%',
 } as Partial<JupyterLabAppProps>;

packages/react/src/components/jupyterlab/JupyterLabApp.tsx

@@ -25,7 +25,7 @@ type Plugin = JupyterFrontEndPlugin<any, any, any> & {
 type Plugins = Map<string, Plugin>;
 
 type Props = JupyterLabAppProps & {
-  serviceManager: ServiceManager;
+  serviceManager: ServiceManager.IManager;
   collaborative?: boolean;
 };
 

packages/react/src/components/jupyterlab/JupyterLabAppAdapter.ts

@@ -81,14 +81,14 @@ export class NotebookAdapter {
   private _readOnly: boolean;
   private _renderers: IRenderMime.IRendererFactory[];
   private _rendermime?: RenderMimeRegistry;
-  private _serviceManager: ServiceManager;
+  private _serviceManager: ServiceManager.IManager;
   private _tracker?: NotebookTracker;
   private _id: string;
   private _CellSidebar?: (props: any) => JSX.Element;
 
   constructor(
     props: INotebookProps,
-    serviceManager: ServiceManager,
+    serviceManager: ServiceManager.IManager,
     lite?: Lite
   ) {
 //    this._bundledIPyWidgets = props.bundledIPyWidgets;
@@ -508,7 +508,7 @@ export class NotebookAdapter {
     return this._boxPanel;
   }
 
-  get serviceManager(): ServiceManager {
+  get serviceManager(): ServiceManager.IManager {
     return this._serviceManager;
   }
 

packages/react/src/components/notebook/NotebookAdapter.ts

@@ -79,7 +79,7 @@ export type JupyterContextType = {
   /**
    * Jupyter services manager
    */
-  serviceManager?: ServiceManager;
+  serviceManager?: ServiceManager.IManager;
   /**
    * Jupyter Server base URL
    *
@@ -149,6 +149,10 @@ export const ensureJupyterAuth = async (
 };
 
 export type JupyterContextPropsType = {
+  /**
+   * Optional service manager.
+   */
+  serviceManager?: ServiceManager.IManager;
   /**
    * Whether the component is collaborative or not.
    */