rework into newer extension style

Author: jimdigriz

nbgitpuller/__init__.py

@@ -1,82 +1,8 @@
-from .version import __version__ # noqa
-from .pull import GitPuller # noqa
-from jupyter_server.utils import url_path_join
-from tornado.web import StaticFileHandler
-import os
+from .application import NbGitPuller
 
 
 def _jupyter_server_extension_points():
-    """
-    This function is detected by `notebook` and `jupyter_server` because they
-    are explicitly configured to inspect the nbgitpuller module for it. That
-    explicit configuration is passed via setup.py's declared data_files.
-
-    Returns a list of dictionaries with metadata describing where to find the
-    `_load_jupyter_server_extension` function.
-    """
     return [{
         'module': 'nbgitpuller',
+        'app': NbGitPuller
     }]
-
-
-def _load_jupyter_server_extension(app):
-    """
-    This function is a hook for `notebook` and `jupyter_server` that we use to
-    register additional endpoints to be handled by nbgitpuller.
-
-    Note that as this function is used as a hook for both notebook and
-    jupyter_server, the argument passed may be a NotebookApp or a ServerApp.
-
-    Related documentation:
-    - notebook: https://jupyter-notebook.readthedocs.io/en/stable/extending/handlers.htmland
-    - notebook: https://jupyter-notebook.readthedocs.io/en/stable/examples/Notebook/Distributing%20Jupyter%20Extensions%20as%20Python%20Packages.html#Example---Server-extension
-    - jupyter_server: https://jupyter-server.readthedocs.io/en/latest/developers/extensions.html
-    """
-    # identify base handler by app class
-    # must do this before importing from .handlers
-    from ._compat import get_base_handler
-
-    get_base_handler(app)
-
-    from .handlers import (
-        SyncHandler,
-        UIHandler,
-        LegacyInteractRedirectHandler,
-        LegacyGitSyncRedirectHandler,
-    )
-
-    web_app = app.web_app
-    base_url = url_path_join(web_app.settings['base_url'], 'git-pull')
-    handlers = [
-        (url_path_join(base_url, 'api'), SyncHandler),
-        (base_url, UIHandler),
-        (url_path_join(web_app.settings['base_url'], 'git-sync'), LegacyGitSyncRedirectHandler),
-        (url_path_join(web_app.settings['base_url'], 'interact'), LegacyInteractRedirectHandler),
-        (
-            url_path_join(base_url, 'static', '(.*)'),
-            StaticFileHandler,
-            {'path': os.path.join(os.path.dirname(__file__), 'static')}
-        )
-    ]
-    # FIXME: See note on how to stop relying on settings to pass information:
-    #        https://github.com/jupyterhub/nbgitpuller/pull/242#pullrequestreview-854968180
-    #
-    web_app.settings['nbapp'] = app
-    web_app.add_handlers('.*', handlers)
-
-
-# For compatibility with both notebook and jupyter_server, we define
-# _jupyter_server_extension_paths alongside _jupyter_server_extension_points.
-#
-# "..._paths" is used by notebook and still supported by jupyter_server as of
-# jupyter_server 1.13.3, but was renamed to "..._points" in jupyter_server
-# 1.0.0.
-#
-_jupyter_server_extension_paths = _jupyter_server_extension_points
-
-# For compatibility with both notebook and jupyter_server, we define both
-# load_jupyter_server_extension alongside _load_jupyter_server_extension.
-#
-# "load..." is used by notebook and "_load..." is used by jupyter_server.
-#
-load_jupyter_server_extension = _load_jupyter_server_extension

nbgitpuller/_compat.py

@@ -0,0 +1,29 @@
+from .version import __version__ # noqa
+from .pull import GitPuller # noqa
+from jupyter_server.extension.application import ExtensionApp
+import os
+
+
+class NbGitPuller(ExtensionApp):
+    name = 'git-pull'
+    load_other_extensions = True
+
+    static_paths = [
+        os.path.join(os.path.dirname(__file__), 'static')
+    ]
+
+    def initialize_handlers(self):
+        from .handlers import (
+            SyncHandler,
+            UIHandler,
+            LegacyInteractRedirectHandler,
+            LegacyGitSyncRedirectHandler,
+        )
+
+        # Extend the self.handlers trait
+        self.handlers.extend([
+            (rf'/{self.name}/api', SyncHandler),
+            (rf'/{self.name}', UIHandler),
+            (rf'/{self.name}/git-sync', LegacyGitSyncRedirectHandler),
+            (rf'/{self.name}/interact', LegacyInteractRedirectHandler),
+        ])

nbgitpuller/application.py

@@ -7,23 +7,24 @@
 import os
 from queue import Queue, Empty
 import jinja2
+from jupyter_server.base.handlers import JupyterHandler
+from jupyter_server.extension.handler import ExtensionHandlerMixin
 
 from .pull import GitPuller
 from .version import __version__
-from ._compat import get_base_handler
-
-JupyterHandler = get_base_handler()
 
 
 jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(
         os.path.join(os.path.dirname(__file__), 'templates')
     ),
 )
 
-class SyncHandler(JupyterHandler):
+class SyncHandler(ExtensionHandlerMixin, JupyterHandler):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.log.info(f'Config {self.config}')
+
         # We use this lock to make sure that only one sync operation
         # can be happening at a time. Git doesn't like concurrent use!
         if 'git_lock' not in self.settings:
@@ -84,7 +85,7 @@ async def get(self):
             self.set_header('content-type', 'text/event-stream')
             self.set_header('cache-control', 'no-cache')
 
-            gp = GitPuller(repo, repo_dir, branch=branch, depth=depth, parent=self.settings['nbapp'])
+            gp = GitPuller(repo, repo_dir, branch, depth=depth, **self.config)
 
             q = Queue()
 

nbgitpuller/handlers.py

@@ -69,18 +69,18 @@ def _depth_default(self):
         where the GitPuller class hadn't been loaded already."""
         return int(os.environ.get('NBGITPULLER_DEPTH', 1))
 
-    def __init__(self, git_url, repo_dir, **kwargs):
+    def __init__(self, git_url, repo_dir, branch, **kwargs):
         assert git_url
 
         self.git_url = git_url
-        self.branch_name = kwargs.pop("branch")
+        self.repo_dir = repo_dir
+        self.branch_name = branch
 
         if self.branch_name is None:
             self.branch_name = self.resolve_default_branch()
         elif not self.branch_exists(self.branch_name):
             raise ValueError(f"Branch: {self.branch_name} -- not found in repo: {self.git_url}")
 
-        self.repo_dir = repo_dir
         newargs = {k: v for k, v in kwargs.items() if v is not None}
         super(GitPuller, self).__init__(**newargs)
 
@@ -361,7 +361,7 @@ def main():
     for line in GitPuller(
         args.git_url,
         args.repo_dir,
-        branch=args.branch_name if args.branch_name else None
+        args.branch_name if args.branch_name else None
     ).pull():
         print(line)
 

nbgitpuller/pull.py

@@ -35,7 +35,7 @@
 
 {% block script %}
 {{super()}}
-<script src="{{ base_url }}git-pull/static/dist/bundle.js"></script>
+<script src="{{ base_url }}/static/git-pull/dist/bundle.js"></script>
 {% endblock %}
 
 {% block stylesheet %}

nbgitpuller/templates/status.html

@@ -8,7 +8,7 @@
 from uuid import uuid4
 
 from packaging.version import Version as V
-from nbgitpuller import GitPuller
+from nbgitpuller.pull import GitPuller
 
 
 class Repository: