Merge branch 'master' into console-logs

Author: krassowski

CHANGELOG.md

@@ -5,6 +5,7 @@
 - features
 
   - make the extension work with `jupyterlab-classic` - experimental, not all features are functional yet ([#465])
+  - new status "Server extension missing" and a dialog with advice was added to help users with atypical configurations ([#476])
   - for developers: the verbosity of console logs is now controllable from settings and set to warn by default ([#480])
 
 - bug fixes:
@@ -17,6 +18,7 @@
 [#449]: https://github.com/krassowski/jupyterlab-lsp/pull/449
 [#465]: https://github.com/krassowski/jupyterlab-lsp/pull/465
 [#474]: https://github.com/krassowski/jupyterlab-lsp/pull/474
+[#476]: https://github.com/krassowski/jupyterlab-lsp/pull/476
 [#478]: https://github.com/krassowski/jupyterlab-lsp/pull/478
 [#480]: https://github.com/krassowski/jupyterlab-lsp/pull/480
 

atest/04_Interface/BackendFailure.robot

@@ -0,0 +1,17 @@
+*** Settings ***
+Suite Setup       Setup Server and Browser    server_extension_enabled=${False}
+Resource          ../Keywords.robot
+
+*** Variables ***
+${STATUSBAR}      css:div.lsp-statusbar-item
+${POPOVER}        css:.lsp-popover
+
+*** Test Cases ***
+Handles Server Extension Failure
+    Setup Notebook    Python    Python.ipynb    wait=${False}
+    Element Should Contain    ${STATUSBAR}    Server extension missing
+    Click Element    ${STATUSBAR}
+    Wait For Dialog
+    Accept Default Dialog Option
+    Page Should Not Contain Element    ${POPOVER}
+    [Teardown]    Clean Up After Working With File    Python.ipynb

atest/Keywords.robot

@@ -11,14 +11,17 @@ Library           ./config.py
 
 *** Keywords ***
 Setup Server and Browser
+    [Arguments]    ${server_extension_enabled}=${True}
     Initialize Global Variables
-    Create Notebok Server Config
+    Create Notebok Server Config    ${server_extension_enabled}
     Initialize User Settings
+    ${disable_global_config} =    Set Variable If    ${server_extension_enabled} != ${True}    '1'    ${EMPTY}
     ${server} =    Start Process    jupyter-lab
     ...    cwd=${NOTEBOOK DIR}
     ...    stdout=${LAB LOG}
     ...    stderr=STDOUT
     ...    env:HOME=${HOME}
+    ...    env:JUPYTER_NO_CONFIG=${disable_global_config}
     Set Global Variable    ${SERVER}    ${server}
     Open JupyterLab
     Read Page Config
@@ -34,6 +37,7 @@ Initialize Global Variables
     Set Screenshot Directory    ${SCREENSHOTS DIR}
 
 Create Notebok Server Config
+    [Arguments]    ${server_extension_enabled}=${True}
     [Documentation]    Copies in notebook server config file and updates accordingly
     ${conf} =    Set Variable    ${NOTEBOOK DIR}${/}${NBSERVER CONF}
     ${extra_node_roots} =    Create List    ${ROOT}
@@ -47,9 +51,20 @@ Create Notebok Server Config
     ...    token=${TOKEN}
     ...    user_settings_dir=${SETTINGS DIR}
     ...    workspaces_dir=${WORKSPACES DIR}
+    # should be automatically enabled, so do not enable manually:
+    Run Keyword Unless
+    ...    ${server_extension_enabled}
+    ...    Set Server Extension State    ${conf}    enabled=${server_extension_enabled}
     Update Jupyter Config    ${conf}    LanguageServerManager
     ...    extra_node_roots=@{extra_node_roots}
 
+Set Server Extension State
+    [Arguments]    ${conf}    ${enabled}=${True}
+    ${extension_state} =    Create Dictionary    enabled=${enabled}
+    ${extensions} =    Create Dictionary    jupyter_lsp=${extension_state}
+    Update Jupyter Config    ${conf}    LabApp
+    ...    jpserver_extensions=${extensions}
+
 Read Page Config
     ${script} =    Get Element Attribute    id:jupyter-config-data    innerHTML
     ${config} =    Evaluate    __import__("json").loads(r"""${script}""")
@@ -249,14 +264,16 @@ Clean Up After Working With File
     Lab Log Should Not Contain Known Error Messages
 
 Setup Notebook
-    [Arguments]    ${Language}    ${file}    ${isolated}=${True}
+    [Arguments]    ${Language}    ${file}    ${isolated}=${True}    ${wait}=${True}
     Set Tags    language:${Language.lower()}
     Run Keyword If    ${isolated}    Set Screenshot Directory    ${SCREENSHOTS DIR}${/}notebook${/}${TEST NAME.replace(' ', '_')}
     Copy File    examples${/}${file}    ${NOTEBOOK DIR}${/}${file}
     Run Keyword If    ${isolated}    Try to Close All Tabs
     Open ${file} in ${MENU NOTEBOOK}
     Capture Page Screenshot    00-notebook-opened.png
-    Wait Until Fully Initialized
+    Run Keyword If
+    ...    ${wait}
+    ...    Wait Until Fully Initialized
     Capture Page Screenshot    01-notebook-initialized.png
 
 Open Diagnostics Panel
@@ -392,3 +409,7 @@ Measure Cursor Position
     Wait Until Page Contains Element    ${CM CURSORS}
     ${position} =    Wait Until Keyword Succeeds    20 x    0.05s    Get Vertical Position    ${CM CURSOR}
     [Return]    ${position}
+
+Switch To Tab
+    [Arguments]    ${file}
+    Click Element    ${JLAB XP DOCK TAB}\[contains(., '${file}')]

packages/jupyterlab-lsp/src/components/statusbar.tsx

@@ -35,6 +35,9 @@ import { DocumentLocator } from './utils';
 import { INotebookModel, NotebookPanel } from '@jupyterlab/notebook';
 import { LanguageServerManager } from '../manager';
 import { codeCheckIcon, codeClockIcon, codeWarningIcon } from './icons';
+import { Dialog, showDialog } from '@jupyterlab/apputils';
+import { SERVER_EXTENSION_404 } from '../errors';
+import okButton = Dialog.okButton;
 
 interface IServerStatusProps {
   server: SCHEMA.LanguageServerSession;
@@ -317,11 +320,19 @@ export class LSPStatus extends VDomRenderer<LSPStatus.Model> {
     if (this._popup) {
       this._popup.dispose();
     }
-    this._popup = showPopup({
-      body: new LSPPopup(this.model),
-      anchor: this,
-      align: 'left'
-    });
+    if (this.model.status.status == 'no_server_extension') {
+      showDialog({
+        title: 'LSP server extension not found',
+        body: SERVER_EXTENSION_404,
+        buttons: [okButton()]
+      }).catch(console.warn);
+    } else {
+      this._popup = showPopup({
+        body: new LSPPopup(this.model),
+        anchor: this,
+        align: 'left'
+      });
+    }
   };
 }
 
@@ -364,6 +375,7 @@ export class StatusButtonExtension
 }
 
 type StatusCode =
+  | 'no_server_extension'
   | 'waiting'
   | 'initializing'
   | 'initialized'
@@ -389,6 +401,7 @@ type StatusMap = Record<StatusCode, string>;
 type StatusIconClass = Record<StatusCode, string>;
 
 const classByStatus: StatusIconClass = {
+  no_server_extension: 'error',
   waiting: 'inactive',
   initialized: 'ready',
   initializing: 'preparing',
@@ -397,6 +410,7 @@ const classByStatus: StatusIconClass = {
 };
 
 const iconByStatus: Record<StatusCode, LabIcon> = {
+  no_server_extension: codeWarningIcon,
   waiting: codeClockIcon,
   initialized: codeCheckIcon,
   initializing: codeClockIcon,
@@ -405,6 +419,7 @@ const iconByStatus: Record<StatusCode, LabIcon> = {
 };
 
 const shortMessageByStatus: StatusMap = {
+  no_server_extension: 'Server extension missing',
   waiting: 'Waiting...',
   initialized: 'Fully initialized',
   initialized_but_some_missing: 'Initialized (additional servers needed)',
@@ -569,7 +584,9 @@ export namespace LSPStatus {
       });
 
       let status: StatusCode;
-      if (detected_documents.size === 0) {
+      if (this.language_server_manager.statusCode === 404) {
+        status = 'no_server_extension';
+      } else if (detected_documents.size === 0) {
         status = 'waiting';
       } else if (initialized_documents.size === detected_documents.size) {
         status = 'initialized';

packages/jupyterlab-lsp/src/errors.tsx

@@ -0,0 +1,56 @@
+import React from 'react';
+
+function external_link(url: string, label: string) {
+  return (
+    <a
+      href={url}
+      target="_blank"
+      rel="noopener noreferrer"
+      className="lsp-external-link"
+    >
+      {label}
+    </a>
+  );
+}
+
+const migration_guide_url =
+  'https://jupyter-server.readthedocs.io/en/latest/operators/migrate-from-nbserver.html';
+const jupyter_hub_migration_url =
+  'https://github.com/jupyterhub/jupyterhub/pull/3329/files';
+
+export const SERVER_EXTENSION_404 = (
+  <div>
+    <p>
+      It appears that the required Jupyter server extension (
+      <code>jupyter-lsp</code>) is not installed (or not enabled) in this
+      environment.
+    </p>
+    <h3>What are the likely reasons?</h3>
+    <ul>
+      <li>
+        It might be that you just installed it and need to restart JupyterLab to
+        make it available on startup.
+      </li>
+      <li>
+        Alternatively, you may be using an older <code>notebook</code> server
+        instead of the new <code>jupyter_server</code>; please refer to the{' '}
+        {external_link(migration_guide_url, 'migration guide')} or if you are a
+        JupyterHub user please ensure that you start the JupyterLab using{' '}
+        <code>jupyter_server</code> and not the old <code>notebook</code>, as
+        documented in{' '}
+        {external_link(jupyter_hub_migration_url, 'this pull request')}.
+      </li>
+      <li>
+        There may be schema errors or language server errors preventing the
+        extension from loading - please check the logs of JupyterLab (in the
+        console where you execute <code>jupyter lab</code>
+      </li>
+    </ul>
+    <h3>How do I check if the extension is installed?</h3>
+    <p>
+      Please ensure that <code>jupyter server extension list</code> includes
+      jupyter-lsp and that it is enabled. If it is enabled please try to restart
+      JupyterLab.
+    </p>
+  </div>
+);

packages/jupyterlab-lsp/src/manager.ts

@@ -14,10 +14,16 @@ export class LanguageServerManager implements ILanguageServerManager {
   protected _sessions: TSessionMap = new Map();
   private _settings: ServerConnection.ISettings;
   private _baseUrl: string;
+  private _statusCode: number;
+  private _retries: number;
+  private _retriesInterval: number;
 
   constructor(options: ILanguageServerManager.IOptions) {
     this._settings = options.settings || ServerConnection.makeSettings();
     this._baseUrl = options.baseUrl || PageConfig.getBaseUrl();
+    this._retries = options.retries || 2;
+    this._retriesInterval = options.retriesInterval || 10000;
+    this._statusCode = null;
     this.fetchSessions().catch(console.warn);
   }
 
@@ -45,15 +51,25 @@ export class LanguageServerManager implements ILanguageServerManager {
     return null;
   }
 
+  get statusCode(): number {
+    return this._statusCode;
+  }
+
   async fetchSessions() {
     let response = await ServerConnection.makeRequest(
       this.statusUrl,
       { method: 'GET' },
       this._settings
     );
 
+    this._statusCode = response.status;
+
     if (!response.ok) {
       console.error('Could not fetch sessions', response);
+      if (this._retries > 0) {
+        this._retries -= 1;
+        setTimeout(this.fetchSessions.bind(this), this._retriesInterval);
+      }
       return;
     }
 

packages/jupyterlab-lsp/src/tokens.ts

@@ -57,6 +57,7 @@ export interface ILanguageServerManager {
   ): TLanguageServerId;
   fetchSessions(): Promise<void>;
   statusUrl: string;
+  statusCode: number;
 }
 
 export interface ILanguageServerConfiguration {
@@ -73,6 +74,15 @@ export namespace ILanguageServerManager {
   export interface IOptions {
     settings?: ServerConnection.ISettings;
     baseUrl?: string;
+    /**
+     * Number of connection retries to fetch the sessions.
+     * Default 2.
+     */
+    retries?: number;
+    /**
+     * The interval for retries, default 10 seconds.
+     */
+    retriesInterval?: number;
   }
   export interface IGetServerIdOptions {
     language?: TLanguageId;

packages/jupyterlab-lsp/style/index.css

@@ -13,3 +13,7 @@
   transform: scaleX(-1);
   transform-origin: center center;
 }
+
+.lsp-external-link {
+  color: var(--jp-content-link-color);
+}

packages/jupyterlab-lsp/style/statusbar.css

@@ -106,6 +106,10 @@ h5 {
   fill: var(--jp-warn-color0);
 }
 
+.lsp-status-icon.error svg g {
+  fill: var(--jp-error-color0);
+}
+
 .lsp-status-icon.inactive svg g {
   fill: var(--jp-layout-color3);
 }