From f58e77058a6227575bbed3eeeea903846aff2c47 Mon Sep 17 00:00:00 2001
From: David Brochart <david.brochart@gmail.com>
Date: Wed, 27 Oct 2021 11:02:27 +0200
Subject: [PATCH] Cleanup

---
 voila/app.py               | 6 +++---
 voila/handler.py           | 2 +-
 voila/notebook_renderer.py | 6 +++---
 voila/treehandler.py       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/voila/app.py b/voila/app.py
index ebfa3cab9..74c2a0d82 100644
--- a/voila/app.py
+++ b/voila/app.py
@@ -45,9 +45,6 @@
 from jupyter_server.utils import url_path_join, run_sync
 from jupyter_server.services.config import ConfigManager
 
-from fps_uvicorn.cli import app as fps_app
-from fps_voila.routes import init_voila_handler
-
 from jupyter_client.kernelspec import KernelSpecManager
 
 from jupyter_core.paths import jupyter_config_path, jupyter_path
@@ -457,6 +454,9 @@ def start(self):
         self.server_url = self.server_url or self.base_url
 
         if self.fps:
+            from fps_uvicorn.cli import app as fps_app
+            from fps_voila.routes import init_voila_handler
+
             # pass options to FPS app
             options = sys.argv[1:]
             sys.argv = sys.argv[:1]
diff --git a/voila/handler.py b/voila/handler.py
index ea0b0dd73..7b7dcedd4 100644
--- a/voila/handler.py
+++ b/voila/handler.py
@@ -114,7 +114,7 @@ async def _get(self, path=None):
     else:
         # All kernels are used or pre-heated kernel is disabled, start a normal kernel.
         gen = NotebookRenderer(
-            self.is_fps,
+            is_fps=self.is_fps,
             voila_configuration=self.voila_configuration,
             traitlet_config=self.traitlet_config,
             notebook_path=notebook_path,
diff --git a/voila/notebook_renderer.py b/voila/notebook_renderer.py
index 946874eae..6fc50a4ba 100644
--- a/voila/notebook_renderer.py
+++ b/voila/notebook_renderer.py
@@ -21,7 +21,6 @@
 from nbclient.util import ensure_async
 from nbconvert.preprocessors import ClearOutputPreprocessor
 from traitlets.config.configurable import LoggingConfigurable
-from fps_kernels.kernel_server.server import KernelServer, kernels, connect_channel
 
 from .execute import VoilaExecutor, strip_code_cell_warnings
 from .exporter import VoilaExporter
@@ -32,9 +31,9 @@
 class NotebookRenderer(LoggingConfigurable):
     """Render the notebook into HTML string."""
 
-    def __init__(self, is_fps, **kwargs):
+    def __init__(self, **kwargs):
         super().__init__()
-        self.is_fps = is_fps
+        self.is_fps = kwargs.pop("is_fps", False)
         self.root_dir = kwargs.get('root_dir', [])
         self.notebook_path = kwargs.get('notebook_path', [])  # should it be []
         self.template_paths = kwargs.get('template_paths', [])
@@ -210,6 +209,7 @@ async def _jinja_kernel_start(self, nb, kernel_id, kernel_future):
         assert not self.kernel_started, 'kernel was already started'
         km = await ensure_async(kernel_future)
         if self.is_fps:
+            from fps_kernels.kernel_server.server import KernelServer, kernels, connect_channel
             connection_cfg = km.get_connection_info()
             connection_cfg["key"] = connection_cfg["key"].decode()
             kernel_server = KernelServer(connection_cfg=connection_cfg, write_connection_file=False)
diff --git a/voila/treehandler.py b/voila/treehandler.py
index 450c1741e..b34994ee7 100644
--- a/voila/treehandler.py
+++ b/voila/treehandler.py
@@ -9,7 +9,6 @@
 import os
 
 from tornado import web
-from fastapi import HTTPException
 
 from jupyter_server.base.handlers import JupyterHandler
 from jupyter_server.utils import url_path_join, url_escape
@@ -56,6 +55,7 @@ def allowed_content(content):
         return self.redirect(url)
     else:
         if self.is_fps:
+            from fastapi import HTTPException
             raise HTTPException(status_code=404, detail=f"{path} not found")
         else:
             raise web.HTTPError(404)