upgrade idom

Author: rmorshea

.gitignore

@@ -12,6 +12,7 @@ idom_jupyter/labextension/
 .DS_Store
 
 # Py Env
+venv
 .python-version
 
 # VSCode

MANIFEST

@@ -1,5 +1,6 @@
 from functools import partial
 
+from idom.config import IDOM_CLIENT_IMPORT_SOURCE_URL
 from idom.core.component import AbstractComponent
 from IPython import get_ipython
 from IPython.display import display
@@ -14,6 +15,9 @@
 def load_ipython_extension(ipython):
     global _POST_RUN_CELL_HOOK, _EXTENSION_LOADED
     if not _EXTENSION_LOADED:
+        # allow client to determine build location
+        IDOM_CLIENT_IMPORT_SOURCE_URL.set("./")
+
         _POST_RUN_CELL_HOOK = partial(_post_run_cell, ipython)
         ipython.events.register("post_run_cell", _POST_RUN_CELL_HOOK)
         ipython.display_formatter.ipython_display_formatter.for_type(

idom_jupyter/ipython_extension.py

@@ -1,21 +1,22 @@
 from urllib.parse import urljoin
 
 from notebook.notebookapp import NotebookApp
-from idom.client.manage import WEB_MODULES_DIR
+from idom.config import IDOM_CLIENT_BUILD_DIR
 from tornado.web import StaticFileHandler
 from tornado.web import Application
 
 
 def _load_jupyter_server_extension(notebook_app: NotebookApp):
     web_app: Application = notebook_app.web_app
-    route_pattern = urljoin(web_app.settings["base_url"], "_idom_web_modules/(.*)")
+    base_url = web_app.settings["base_url"]
+    route_pattern = urljoin(base_url, r"_idom_web_modules/(.*)")
     web_app.add_handlers(
         host_pattern=".*$",
         host_handlers=[
             (
                 route_pattern,
                 StaticFileHandler,
-                {"path": str(WEB_MODULES_DIR.absolute())},
+                {"path": str(IDOM_CLIENT_BUILD_DIR.get().absolute())},
             ),
         ],
     )

idom_jupyter/jupyter_server_extension.py

@@ -31,9 +31,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "54ca25e9c74e4790aea3020c3bf47cff",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "LayoutWidget()"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "import idom\n",
     "import idom_jupyter\n",
@@ -63,18 +78,42 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "2021-03-30T16:24:30-0700 | INFO | Already installed ['victory']\r\n",
+      "2021-03-30T16:24:30-0700 | INFO | Build skipped ✅\r\n"
+     ]
+    }
+   ],
    "source": [
     "!idom install victory"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "33e61a1f3f7949c1a5c15a0d3c3e485a",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "LayoutWidget()"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "victory = idom.Module(\"victory\", fallback=\"loading...\")\n",
     "\n",

notebooks/introduction.ipynb

@@ -67,7 +67,7 @@
     description="A client for IDOM implemented using Jupyter widgets",
     long_description=LONG_DESCRIPTION,
     include_package_data=True,
-    install_requires=["ipywidgets>=7.6.0", "idom>=0.22.2"],
+    install_requires=["ipywidgets>=7.6.0", "idom>=0.23,<0.24"],
     packages=find_packages(),
     zip_safe=False,
     cmdclass=cmdclass,