pass serverapp to extension manager methods

Author: Zsailer

jupyter_server/extension/application.py

@@ -292,20 +292,16 @@ def _prepare_templates(self):
         self.initialize_templates()
 
     @classmethod
-    def initialize_server(cls, argv=[], load_other_extensions=True, **kwargs):
-        """Creates an instance of ServerApp where this extension is enabled
-        (superceding disabling found in other config from files).
-
-        This is necessary when launching the ExtensionApp directly from
-        the `launch_instance` classmethod.
-        """
-        # The ExtensionApp needs to add itself as enabled extension
-        # to the jpserver_extensions trait, so that the ServerApp
-        # initializes it.
-        config = Config(cls._jupyter_server_config())
-        serverapp = ServerApp.instance(**kwargs, argv=[], config=config)
-        serverapp.initialize(argv=argv, find_extensions=load_other_extensions)
-        return serverapp
+    def _jupyter_server_config(cls):
+        base_config = {
+            "ServerApp": {
+                "jpserver_extensions": {cls.get_extension_package(): True},
+                "open_browser": True,
+                "default_url": cls.extension_url
+            }
+        }
+        base_config["ServerApp"].update(cls.server_config)
+        return base_config
 
     def _link_jupyter_server_extension(self, serverapp):
         """Link the ExtensionApp to an initialized ServerApp.
@@ -335,6 +331,22 @@ def _link_jupyter_server_extension(self, serverapp):
         # i.e. ServerApp traits <--- ExtensionApp config
         self.serverapp.update_config(self.config)
 
+    @classmethod
+    def initialize_server(cls, argv=[], load_other_extensions=True, **kwargs):
+        """Creates an instance of ServerApp where this extension is enabled
+        (superceding disabling found in other config from files).
+
+        This is necessary when launching the ExtensionApp directly from
+        the `launch_instance` classmethod.
+        """
+        # The ExtensionApp needs to add itself as enabled extension
+        # to the jpserver_extensions trait, so that the ServerApp
+        # initializes it.
+        config = Config(cls._jupyter_server_config())
+        serverapp = ServerApp.instance(**kwargs, argv=[], config=config)
+        serverapp.initialize(argv=argv, find_extensions=load_other_extensions)
+        return serverapp
+
     def initialize(self):
         """Initialize the extension app. The
         corresponding server app and webapp should already
@@ -374,18 +386,6 @@ def stop(self):
         self.serverapp.stop()
         self.serverapp.clear_instance()
 
-    @classmethod
-    def _jupyter_server_config(cls):
-        base_config = {
-            "ServerApp": {
-                "jpserver_extensions": {cls.get_extension_package(): True},
-                "open_browser": True,
-                "default_url": cls.extension_url
-            }
-        }
-        base_config["ServerApp"].update(cls.server_config)
-        return base_config
-
     @classmethod
     def _load_jupyter_server_extension(cls, serverapp):
         """Initialize and configure this extension, then add the extension's

jupyter_server/extension/manager.py

@@ -215,27 +215,27 @@ def extension_points(self):
             points.update(ext.extension_points)
         return points
 
-    def link_extensions(self):
+    def link_extensions(self, serverapp):
         """Link all enabled extensions
          to an instance of ServerApp
         """
         # Sort the extension names to enforce deterministic linking
         # order.
         for name, ext in sorted(self.extension_points.items()):
             try:
-                ext.link(self.parent)
+                ext.link(serverapp)
             except Exception as e:
                 self.log.warning(e)
 
-    def load_extensions(self):
+    def load_extensions(self, serverapp):
         """Load all enabled extensions and append them to
         the parent ServerApp.
         """
         # Sort the extension names to enforce deterministic loading
         # order.
         for name, ext in sorted(self.extension_points.items()):
             try:
-                ext.load(self.parent)
+                ext.load(serverapp)
             except Exception as e:
                 self.log.warning(e)
 

jupyter_server/serverapp.py

@@ -1514,7 +1514,7 @@ def init_server_extensions(self):
             logger=self.log,
             jpserver_extensions=self.jpserver_extensions
         )
-        self.extension_manager.link_extensions()
+        self.extension_manager.link_extensions(self)
 
     def load_server_extensions(self):
         """Load any extensions specified by config.
@@ -1524,7 +1524,7 @@ def load_server_extensions(self):
 
         The extension API is experimental, and may change in future releases.
         """
-        self.extension_manager.load_extensions()
+        self.extension_manager.load_extensions(self)
 
     def init_mime_overrides(self):
         # On some Windows machines, an application has registered incorrect