put server extension under ipyparallel prefix

Author: minrk

.pre-commit-config.yaml

@@ -27,6 +27,7 @@ repos:
     hooks:
       - id: eslint
         files: \.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
+        exclude: ipyparallel/nbextension/.*
         types: [file]
         additional_dependencies:
           - "@typescript-eslint/[email protected]"

ipyparallel/nbextension/handlers.py

@@ -93,15 +93,14 @@ async def delete(self, cluster_key):
 # -----------------------------------------------------------------------------
 
 
-_cluster_action_regex = r"(?P<action>start|stop|create)"
 _cluster_key_regex = (
     r"(?P<cluster_key>[^\/]+)"  # there is almost no text that is invalid
 )
 
 default_handlers = [
-    (r"/clusters", ClusterListHandler),
+    (r"/ipyparallel/clusters", ClusterListHandler),
     (
-        rf"/clusters/{_cluster_key_regex}",
+        rf"/ipyparallel/clusters/{_cluster_key_regex}",
         ClusterActionHandler,
     ),
 ]

ipyparallel/nbextension/static/clusterlist.js

@@ -49,7 +49,7 @@ define(["base/js/namespace", "jquery", "base/js/utils"], function (
       success: $.proxy(this.load_list_success, this),
       error: utils.log_ajax_error,
     };
-    var url = utils.url_join_encode(this.base_url, "clusters");
+    var url = utils.url_join_encode(this.base_url, "ipyparallel/clusters");
     ajax(url, settings);
   };
 
@@ -150,7 +150,7 @@ define(["base/js/namespace", "jquery", "base/js/utils"], function (
         status_col.text("starting");
         var url = utils.url_join_encode(
           that.base_url,
-          "clusters",
+          "ipyparallel/clusters",
           that.cluster_key
         );
         ajax(url, settings);
@@ -214,7 +214,7 @@ define(["base/js/namespace", "jquery", "base/js/utils"], function (
       status_col.text("stopping");
       var url = utils.url_join_encode(
         that.base_url,
-        "clusters",
+        "ipyparallel/clusters",
         that.cluster_key
       );
       ajax(url, settings);

lab/src/clusters.tsx

@@ -50,6 +50,7 @@ const DRAG_THRESHOLD = 5;
  */
 const JUPYTER_CELL_MIME = "application/vnd.jupyter.cells";
 
+const CLUSTER_PREFIX = "ipyparallel/clusters";
 /**
  * A widget for IPython cluster management.
  */
@@ -432,7 +433,7 @@ export class ClusterManager extends Widget {
     this._isReady = false;
     this._registry.notifyCommandChanged(this._launchClusterId);
     const response = await ServerConnection.makeRequest(
-      `${this._serverSettings.baseUrl}clusters/${this._launchClusterId}`,
+      `${this._serverSettings.baseUrl}${CLUSTER_PREFIX}/${this._launchClusterId}`,
       { method: "POST" },
       this._serverSettings
     );
@@ -455,7 +456,7 @@ export class ClusterManager extends Widget {
    */
   private async _updateClusterList(): Promise<void> {
     const response = await ServerConnection.makeRequest(
-      `${this._serverSettings.baseUrl}clusters`,
+      `${this._serverSettings.baseUrl}${CLUSTER_PREFIX}`,
       {},
       this._serverSettings
     );
@@ -490,7 +491,7 @@ export class ClusterManager extends Widget {
    */
   private async _stopById(id: string): Promise<void> {
     const response = await ServerConnection.makeRequest(
-      `${this._serverSettings.baseUrl}clusters/${id}`,
+      `${this._serverSettings.baseUrl}${CLUSTER_PREFIX}/${id}`,
       { method: "DELETE" },
       this._serverSettings
     );
@@ -517,7 +518,7 @@ export class ClusterManager extends Widget {
     }
 
     const response = await ServerConnection.makeRequest(
-      `${this._serverSettings.baseUrl}clusters/${id}`,
+      `${this._serverSettings.baseUrl}${CLUSTER_PREFIX}/${id}`,
       {
         method: "PATCH",
         body: JSON.stringify(update),