diff --git a/advanced_topics/connect_vscode_to_geolab.md b/advanced_topics/connect_vscode_to_geolab.md index 2fe0f98..3f9e0c0 100644 --- a/advanced_topics/connect_vscode_to_geolab.md +++ b/advanced_topics/connect_vscode_to_geolab.md @@ -16,8 +16,8 @@ special "proxy" extension is needed. On your laptop: - **VS Code** -- **Jupyter extension** (`ms-toolsai.jupyter`) -- **Python extension** (`ms-python.python`) — installed automatically as a dependency of the Jupyter extension +- **JupyterHub extension** (`JupyterHub`) +- **Python extension** (`ms-python.python`) In GeoLab: @@ -80,43 +80,43 @@ Copy that entire line — you will paste it into VS Code in the next section. ## VS Code side: connect to the server -1. Install the **Jupyter** extension (`ms-toolsai.jupyter`) from the Extensions +1. Install the **Jupyter** extension (`JupyterHub`) from the Extensions view if you have not already. -![Installing ms-toolsai](../img/add_ms-toolsai_extension.png) +![Installing ms-toolsai](../img/jupyterhub.png) 2. Open or create a notebook file (`.ipynb`) in VS Code. -3. Click the **kernel picker** in the top-right of the notebook (it may read - "Select Kernel"). +3. Click the **kernel picker** in the top-right of the notebook ("Select Kernel"). -![Select Kernel](../img/select_kernel_vscode.png) +![Select kernel](../img/select_kernel_vscode.png) -4. Choose **Select Another Kernel...** +4. Choose **Enter the URL of the running JupyterHub Server...** -![Select anther kernel](../img/select_another_kernel.png) +![Select anther kernel](../img/select_a_jupyter_server.png) -5. Choose **Existing Jupyter Server...** +5. Choose **Enter the URL of running JupyterHub server**. Paste the full tokenized URL you copied from GeoLab, including the + `?token=...` part, then press Enter. -![Exisiting Jupyter Server](../img/existing_jupyter_server.png) +![Exisiting Jupyter Server](../img/enter_jupyterhub_url.png) -6. Choose **Enter the URL of a running Jupyter server**. +7. Press `Enter` for **Enter your username..** -![Enter URL](../img/enter_url_jupyter_server.png) +![Enter username (press Enter)](../img/jupyterhub_enter_username.png) -7. Paste the full tokenized URL you copied from GeoLab, including the - `?token=...` part, then press Enter. +8. Press `Enter` for **Enter your password or API token...**. + +![Accept display name](../img/jupyterhub_enter_password.png) -8. When prompted, accept or edit the display name for the server. +9. Optional: **Change server name** -![Accept display name](../img/jupyter_server_display_name.png) +![Change server name (optional)](../img/jupyterhub_change_server_name.png) -9. Back in the kernel picker, select the kernel exposed by the remote server - (for example, the Python 3 kernel from your GeoLab environment). +10. **Select a Kernel from JupyterHub GeoLab**. Choose `Python 3 (ipykernel)` to select a new kernel. -![Select kernel](../img/select_jupyter_kernel.png) +![Select kernel](../img/jupyterhub_select_kernel.png) -10. Run a cell to confirm. Execution now happens inside your GeoLab pod, using +11. Run a cell to confirm. Execution now happens inside your GeoLab pod, using the GeoLab environment and compute — not your laptop. --- diff --git a/img/enter_jupyterhub_url.png b/img/enter_jupyterhub_url.png new file mode 100644 index 0000000..6b050ff Binary files /dev/null and b/img/enter_jupyterhub_url.png differ diff --git a/img/enter_url_jupyter_server.png b/img/enter_url_jupyter_server.png deleted file mode 100644 index 955790b..0000000 Binary files a/img/enter_url_jupyter_server.png and /dev/null differ diff --git a/img/jupyter_server_display_name.png b/img/jupyter_server_display_name.png deleted file mode 100644 index 83fa224..0000000 Binary files a/img/jupyter_server_display_name.png and /dev/null differ diff --git a/img/jupyterhub.png b/img/jupyterhub.png new file mode 100644 index 0000000..12bfb62 Binary files /dev/null and b/img/jupyterhub.png differ diff --git a/img/jupyterhub_change_server_name.png b/img/jupyterhub_change_server_name.png new file mode 100644 index 0000000..b114f24 Binary files /dev/null and b/img/jupyterhub_change_server_name.png differ diff --git a/img/jupyterhub_enter_password.png b/img/jupyterhub_enter_password.png new file mode 100644 index 0000000..648f9d8 Binary files /dev/null and b/img/jupyterhub_enter_password.png differ diff --git a/img/jupyterhub_enter_username.png b/img/jupyterhub_enter_username.png new file mode 100644 index 0000000..8eda0e3 Binary files /dev/null and b/img/jupyterhub_enter_username.png differ diff --git a/img/jupyterhub_select_kernel.png b/img/jupyterhub_select_kernel.png new file mode 100644 index 0000000..ee1da1b Binary files /dev/null and b/img/jupyterhub_select_kernel.png differ diff --git a/img/select_a_jupyter_server.png b/img/select_a_jupyter_server.png new file mode 100644 index 0000000..5bbac4f Binary files /dev/null and b/img/select_a_jupyter_server.png differ diff --git a/img/select_another_kernel.png b/img/select_another_kernel.png deleted file mode 100644 index 7daacf8..0000000 Binary files a/img/select_another_kernel.png and /dev/null differ diff --git a/img/select_jupyter_kernel.png b/img/select_jupyter_kernel.png deleted file mode 100644 index d53913a..0000000 Binary files a/img/select_jupyter_kernel.png and /dev/null differ diff --git a/img/select_jupyterhub.png b/img/select_jupyterhub.png new file mode 100644 index 0000000..3b2677a Binary files /dev/null and b/img/select_jupyterhub.png differ