From 91d4cd2cc8797c260ffd94753be8177d2c8ecafb Mon Sep 17 00:00:00 2001
From: Carl <cboettig@gmail.com>
Date: Tue, 23 Apr 2024 11:47:35 -0700
Subject: [PATCH] ...

---
 images/Dockerfile.gpu           |  4 ++--
 images/jupyter-requirements.txt | 24 ++++++++++++------------
 images/spatial-requirements.txt |  7 ++++++-
 jupyterhub/thelio-config.yaml   |  8 ++++----
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/images/Dockerfile.gpu b/images/Dockerfile.gpu
index 98c2753..a2a889a 100644
--- a/images/Dockerfile.gpu
+++ b/images/Dockerfile.gpu
@@ -35,6 +35,6 @@ RUN python3 -m pip install --no-cache-dir -r /tmp/spatial-requirements.txt
 COPY rl-requirements.txt /tmp/rl-requirements.txt
 RUN python3 -m pip install --no-cache-dir -r /tmp/rl-requirements.txt
 
-## no need to register the environment
-#RUN python3 -m ipykernel install --user --name=spatial
+## Register the environment with ipykernel, mostly for vscode to find it
+RUN python3 -m ipykernel install --user --name=venv
 
diff --git a/images/jupyter-requirements.txt b/images/jupyter-requirements.txt
index 43b3a4b..b924027 100644
--- a/images/jupyter-requirements.txt
+++ b/images/jupyter-requirements.txt
@@ -2,6 +2,7 @@ ipykernel
 ipython
 ipywidgets
 jupyter
+jupyter-book
 jupyter-console
 jupyter-events
 jupyter-lsp
@@ -9,10 +10,20 @@ jupyter_client
 jupyter_core
 jupyter_server
 jupyter_server_terminals
+jupyter-server-proxy
+jupyter-tensorboard-proxy 
+jupyter-resource-usage
+jupyter-vscode-proxy
 jupyterlab
+jupyterlab-lsp
+jupyterlab-git
+jupyterlab_myst
 jupyterlab-pygments
-jupyterlab-widgets
+jupyterlab-quarto
 jupyterlab_server
+jupyterlab-theme-solarized-dark
+jupyterlab-widgets
+jupytext
 nbclient
 nbconvert
 nbformat
@@ -20,16 +31,5 @@ notebook
 notebook_shim
 pandocfilters
 Glances
-# extensions
-jupyterlab-git
-jupyter-tensorboard-proxy 
-jupyter-resource-usage
-jupyter-vscode-proxy
-jupyter-book
-jupyterlab_myst
 gh-scoped-creds
-jupyter-server-proxy
-jupyterlab-theme-solarized-dark
-jupyterlab-quarto
-jupytext
 
diff --git a/images/spatial-requirements.txt b/images/spatial-requirements.txt
index bc11ee8..1226cb4 100644
--- a/images/spatial-requirements.txt
+++ b/images/spatial-requirements.txt
@@ -8,6 +8,11 @@ geopandas
 geocube
 h5netcdf
 h5py
+leafmap[raster]
+localtileserver
+mapclassify
+maplibre[all]
+minio
 netCDF4
 odc-geo
 odc-stac
@@ -23,7 +28,7 @@ rio-cogeo
 rioxarray
 stackstac
 streamlit
+streamlit-folium
 xarray
 zarr
-leafmap
 
diff --git a/jupyterhub/thelio-config.yaml b/jupyterhub/thelio-config.yaml
index 4f6c65e..ae6350e 100644
--- a/jupyterhub/thelio-config.yaml
+++ b/jupyterhub/thelio-config.yaml
@@ -42,16 +42,16 @@ singleuser:
                 mem_guarantee: 7991341312
                 mem_limit: 7991341312
             med:
-              display_name: Medium (16 GB RAM)
+              display_name: Medium (30 GB RAM)
               kubespawner_override:
                 mem_guarantee: 15930730496
                 mem_limit: 15930730496
               default: true
             large:
-              display_name: Large (30 GB RAM)
+              display_name: Large (45 GB RAM)
               kubespawner_override:
-                mem_guarantee: 29861460992
-                mem_limit: 29861460992
+                mem_guarantee: 49861460992
+                mem_limit: 49861460992
       kubespawner_override:
         image: "zcr.thelio.carlboettiger.info/boettiger-lab/k8s:latest"
         default_url: /lab # change to /rstudio to go straight to RStudio