Improve Binder and launch jupyverse directly

README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://github.com/jupyter-server/jupyverse/workflows/CI/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?filepath=examples%2Fjupyverse.ipynb)
 
 # jupyverse
 
@@ -9,6 +8,10 @@
 
 A set of [FPS](https://github.com/jupyter-server/fps) plugins implementing a Jupyter server.
 
+Try it online:
+- JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jlab)
+- RetroLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-rlab)
+
 
 ## Motivation for Experimental Server
 

binder/environment.yml

@@ -3,7 +3,5 @@ channels:
   - conda-forge
 dependencies:
   - python =3.9
-  - jupyterlab =3
-  - ipyurl
-  - jupyter-server-proxy >=1.5
+  - jupyter-server-proxy
   - pip

binder/jupyter_notebook_config.py

@@ -0,0 +1,43 @@
+jupyverse_jlab_command = ' '.join([
+    'jupyverse',
+    '--no-open-browser',
+    '--authenticator.mode=noauth',
+    '--RetroLab.enabled=false',
+    '--JupyterLab.collaborative',
+    '--JupyterLab.base_url={base_url}jupyverse-jlab/',
+    '--port={port}',
+] + ['>jupyverse_jlab.log 2>&1'])
+
+
+jupyverse_rlab_command = ' '.join([
+    'jupyverse',
+    '--no-open-browser',
+    '--authenticator.mode=noauth',
+    '--JupyterLab.enabled=false',
+    '--RetroLab.collaborative',
+    '--RetroLab.base_url={base_url}jupyverse-rlab/',
+    '--port={port}',
+] + ['>jupyverse_rlab.log 2>&1'])
+
+
+c.ServerProxy.servers = {
+    'jupyverse-jlab': {
+        'command': [
+            '/bin/bash', '-c', jupyverse_jlab_command
+        ],
+        'timeout': 60,
+        'absolute_url': False
+    },
+    'jupyverse-rlab': {
+        'command': [
+            '/bin/bash', '-c', jupyverse_rlab_command
+        ],
+        'timeout': 60,
+        'absolute_url': False
+    },
+}
+
+c.NotebookApp.default_url = '/jupyverse-jlab'
+
+import logging
+c.NotebookApp.log_level = logging.DEBUG

binder/postBuild

@@ -1,7 +1,14 @@
 #!/bin/bash
 
-python -m pip install git+https://github.com/jupyter-server/fps
-python -m pip install fps-uvicorn==0.0.2
+mkdir fps \
+    && wget -q https://github.com/jupyter-server/fps/archive/master.tar.gz -O - \
+        | tar xz -C fps --strip-components=1 \
+    && cd fps \
+    && python -m pip install . \
+    && python -m pip install plugins/uvicorn \
+    && cd .. \
+    && rm -rf fps
+
 python -m pip install .[jupyterlab] --no-deps
 python -m pip install plugins/jupyterlab
 python -m pip install plugins/retrolab
@@ -11,5 +18,3 @@ python -m pip install plugins/terminals
 python -m pip install plugins/nbconvert
 python -m pip install plugins/yjs
 python -m pip install plugins/auth
-
-jupyter serverextension enable --sys-prefix jupyter_server_proxy

binder/start

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+import sys
+import shutil
+import os
+
+argv = sys.argv[1:] + ['--config', 'binder/jupyter_notebook_config.py']
+print(argv)
+
+with open('startup_args.txt', 'w') as fid:
+    fid.write(str(argv))
+
+os.execv(shutil.which(argv[0]), argv)

plugins/jupyterlab/fps_jupyterlab/routes.py

@@ -7,7 +7,6 @@
 from typing import Optional
 
 from babel import Locale  # type: ignore
-from pydantic import UUID4
 import jupyterlab  # type: ignore
 import jupyverse  # type: ignore
 from fastapi import APIRouter, Response, Depends, status
@@ -72,7 +71,7 @@
 @router.get("/")
 async def get_root(
     response: Response,
-    token: Optional[UUID4] = None,
+    token: Optional[str] = None,
     auth_config=Depends(get_auth_config),
     jlab_config=Depends(get_jlab_config),
     user_db=Depends(get_user_db),

plugins/retrolab/fps_retrolab/routes.py

@@ -7,7 +7,6 @@
 from typing import Optional
 
 from babel import Locale  # type: ignore
-from pydantic import UUID4
 from starlette.requests import Request  # type: ignore
 from fps.hooks import register_router  # type: ignore
 import retrolab  # type: ignore
@@ -88,7 +87,7 @@
 @router.get("/")
 async def get_root(
     response: Response,
-    token: Optional[UUID4] = None,
+    token: Optional[str] = None,
     auth_config=Depends(get_auth_config),
     rlab_config=Depends(get_rlab_config),
     user_db=Depends(get_user_db),