perspective-python 3.0.3__tar.gz → 3.1.1__tar.gz

{perspective_python-3.0.3 → perspective_python-3.1.1}/Cargo.lock

@@ -1783,7 +1783,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "perspective"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "async-lock",
  "axum",
@@ -1823,7 +1823,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-client"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "async-lock",
  "futures",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-js"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1874,15 +1874,26 @@ dependencies = [
 
 [[package]]
 name = "perspective-lint"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "glob",
  "yew-fmt",
 ]
 
+[[package]]
+name = "perspective-metadata"
+version = "0.0.0"
+dependencies = [
+ "perspective-client",
+ "perspective-js",
+ "perspective-server",
+ "perspective-viewer",
+ "ts-rs",
+]
+
 [[package]]
 name = "perspective-python"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "async-lock",
  "cmake",
@@ -1902,7 +1913,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-server"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "async-lock",
  "base64 0.22.1",
@@ -1912,12 +1923,13 @@ dependencies = [
  "num_cpus",
  "perspective-client",
  "regex",
+ "shlex",
  "tracing",
 ]
 
 [[package]]
 name = "perspective-viewer"
-version = "3.0.3"
+version = "3.1.1"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -2666,6 +2678,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -3125,10 +3143,11 @@ dependencies = [
 
 [[package]]
 name = "ts-rs"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c"
+checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9"
 dependencies = [
+ "lazy_static",
  "serde_json",
  "thiserror",
  "ts-rs-macros",
@@ -3136,9 +3155,9 @@ dependencies = [
 
 [[package]]
 name = "ts-rs-macros"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
+checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
  "proc-macro2 1.0.83",
  "quote 1.0.36",

{perspective_python-3.0.3 → perspective_python-3.1.1}/Cargo.toml

@@ -12,6 +12,14 @@
 
 [workspace]
 resolver = "2"
+default-members = [
+    "rust/perspective",
+    "rust/perspective-client",
+    "rust/perspective-js",
+    "rust/perspective-python",
+    "rust/perspective-server",
+    "rust/perspective-viewer",
+]
 members = ["rust/perspective-python"]
 
 [profile.dev]

{perspective_python-3.0.3 → perspective_python-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: perspective-python
-Version: 3.0.3
+Version: 3.1.1
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -13,8 +13,14 @@ Classifier: Framework :: Jupyter :: JupyterLab
 Classifier: Framework :: Jupyter :: JupyterLab :: 3
 Classifier: Framework :: Jupyter :: JupyterLab :: Extensions
 Classifier: Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt
-Requires-Dist: jinja2 >=2.0, <4
-Requires-Dist: ipywidgets >=7.5.1, <9
+Requires-Dist: ipywidgets >=7.5.1, <9 ; extra == 'jupyter'
+Requires-Dist: tornado >=5, <7 ; extra == 'tornado'
+Requires-Dist: aiohttp >=2, <4 ; extra == 'aiohttp'
+Requires-Dist: starlette <1 ; extra == 'starlette'
+Provides-Extra: jupyter
+Provides-Extra: tornado
+Provides-Extra: aiohttp
+Provides-Extra: starlette
 Summary: A data visualization and analytics component, especially well-suited for large and/or streaming datasets.
 Home-Page: https://perspective.finos.org
 Author: Andrew Stein <steinlink@gmail.com>

{perspective_python-3.0.3/rust/perspective-python/perspective/handlers → perspective_python-3.1.1/perspective}/__init__.py

@@ -10,17 +10,45 @@
 #  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-try:
-    from .aiohttp import PerspectiveAIOHTTPHandler  # noqa: F401
-except ImportError:
-    ...
-
-try:
-    from .starlette import PerspectiveStarletteHandler  # noqa: F401
-except ImportError:
-    ...
-
-try:
-    from .tornado import PerspectiveTornadoHandler  # noqa: F401
-except ImportError:
-    ...
+__version__ = "3.1.1"
+__all__ = [
+    "_jupyter_labextension_paths",
+    "Server",
+    "Client",
+    "PerspectiveError",
+    "PerspectiveWidget",
+    "ProxySession",
+]
+
+import functools
+
+from .perspective import (
+    Client,
+    PerspectiveError,
+    ProxySession,
+    PySyncServer as Server,
+)
+
+
+GLOBAL_SERVER = Server()
+GLOBAL_CLIENT = GLOBAL_SERVER.new_local_client()
+
+
+@functools.wraps(Client.table)
+def table(*args, **kwargs):
+    return GLOBAL_CLIENT.table(*args, **kwargs)
+
+
+@functools.wraps(Client.open_table)
+def open_table(*args, **kwargs):
+    return GLOBAL_CLIENT.table(*args, **kwargs)
+
+
+@functools.wraps(Client.get_hosted_table_names)
+def get_hosted_table_names(*args, **kwargs):
+    return GLOBAL_CLIENT.get_hosted_table_names(*args, **kwargs)
+
+
+# Read by `jupyter labextension develop`
+def _jupyter_labextension_paths():
+    return [{"src": "labextension", "dest": "@finos/perspective-jupyterlab"}]

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/handlers/aiohttp.py

@@ -11,6 +11,7 @@
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 from aiohttp import web, WSMsgType
+import perspective
 import asyncio
 
 
@@ -34,7 +35,7 @@ class PerspectiveAIOHTTPHandler(object):
     """
 
     def __init__(self, **kwargs):
-        self.server = kwargs.pop("perspective_server")
+        self.server = kwargs.pop("perspective_server", perspective.GLOBAL_SERVER)
         self._request = kwargs.pop("request")
         super().__init__(**kwargs)
 

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/handlers/starlette.py

@@ -11,6 +11,7 @@
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import asyncio
+import perspective
 
 
 class PerspectiveStarletteHandler(object):
@@ -31,7 +32,7 @@ class PerspectiveStarletteHandler(object):
     """
 
     def __init__(self, **kwargs):
-        self._server = kwargs.pop("perspective_server")
+        self._server = kwargs.pop("perspective_server", perspective.GLOBAL_SERVER)
         self._websocket = kwargs.pop("websocket")
         super().__init__(**kwargs)
 

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/handlers/tornado.py

@@ -11,10 +11,14 @@
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 from tornado.websocket import WebSocketHandler
+from tornado.ioloop import IOLoop
+
+import perspective
 
 
 class PerspectiveTornadoHandler(WebSocketHandler):
-    """PerspectiveTornadoHandler is a drop-in implementation of Perspective.
+    """`PerspectiveTornadoHandler` is a drop-in implementation of Perspective as
+    a `tornado` handler.
 
     Use it inside Tornado routing to create a server-side Perspective that is
     ready to receive websocket messages from the front-end `perspective-viewer`.
@@ -38,7 +42,7 @@ class PerspectiveTornadoHandler(WebSocketHandler):
         ... ])
     """
 
-    def initialize(self, perspective_server):
+    def initialize(self, perspective_server=perspective.GLOBAL_SERVER):
         self.server = perspective_server
 
     def open(self):
@@ -56,6 +60,4 @@ class PerspectiveTornadoHandler(WebSocketHandler):
             return
 
         self.session.handle_request(msg)
-
-        # TODO schedule me
-        self.session.poll()
+        IOLoop.current().call_later(0, self.session.poll)

perspective_python-3.0.3/perspective/templates/exported_widget.html.jinja → perspective_python-3.1.1/perspective/templates/exported_widget.html.template

@@ -1,12 +1,12 @@
-<script type="module" src="{{ psp_cdn('perspective') }}"></script>
-<script type="module" src="{{ psp_cdn('perspective-viewer') }}"></script>
-<script type="module" src="{{ psp_cdn('perspective-viewer-datagrid') }}"></script>
-<script type="module" src="{{ psp_cdn('perspective-viewer-d3fc') }}"></script>
-<link rel="stylesheet" crossorigin="anonymous" href="{{ psp_cdn('perspective-viewer', 'css/pro.css') }}" />
+<script type="module" src="$psp_cdn_perspective"></script>
+<script type="module" src="$psp_cdn_perspective_viewer"></script>
+<script type="module" src="$psp_cdn_perspective_viewer_datagrid"></script>
+<script type="module" src="$psp_cdn_perspective_viewer_d3fc"></script>
+<link rel="stylesheet" crossorigin="anonymous" href="$psp_cdn_perspective_viewer_themes" />
 
-<div class="perspective-envelope" id="perspective-envelope-{{viewer_id}}">
+<div class="perspective-envelope" id="perspective-envelope-$viewer_id">
     <script type="application/vnd.apache.arrow.file">
-    {{ b64_data }}
+    $b64_data
     </script>
     <perspective-viewer style="height: 690px;"></perspective-viewer>
     <script type="module">
@@ -16,15 +16,15 @@
             return Uint8Array.from(binString, (m) => m.codePointAt(0));
         }
 
-        import * as perspective from "{{ psp_cdn('perspective') }}";
-        const viewerId = {{ viewer_id | tojson }};
+        import * as perspective from "$psp_cdn_perspective";
+        const viewerId = $viewer_id;
         const currentScript = document.scripts[document.scripts.length - 1];
-        const envelope = document.getElementById(`perspective-envelope-${viewerId}`);
+        const envelope = document.getElementById(`perspective-envelope-$${viewerId}`);
         const dataScript = envelope.querySelector('script[type="application/vnd.apache.arrow.file"]');;
         if (!dataScript)
             throw new Error('data script missing for viewer', viewerId);
         const data = base64ToBytes(dataScript.textContent);
-        const viewerAttrs = {{ viewer_attrs | tojson }};
+        const viewerAttrs = $viewer_attrs;
 
         // Create a new worker, then a new table promise on that worker.
         const table = await perspective.worker().table(data.buffer);

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/tests/core/test_async.py

@@ -47,7 +47,10 @@ data = [{"a": i, "b": i * 0.5, "c": str(i)} for i in range(10)]
 class TestAsync(object):
     @classmethod
     def setup_class(cls):
-        cls.loop = tornado.ioloop.IOLoop()
+        import asyncio
+
+        asyncio.set_event_loop(asyncio.new_event_loop())
+        cls.loop = tornado.ioloop.IOLoop.current()
         cls.thread = threading.Thread(target=cls.loop.start)
         cls.thread.daemon = True
         cls.thread.start()

{perspective_python-3.0.3 → perspective_python-3.1.1}/perspective/tests/server/test_server.py

@@ -1007,11 +1007,13 @@ class TestServer(object):
         server = Server()
         client = Client.from_server(server, loop_callback=fake_queue_process)
         table = client.table({"a": [1, 2, 3]}, name="tbl")
+        view = table.view()
+        view.on_update(lambda *args: print(args))
         table.update({"a": [4, 5, 6]})
         assert table.view().to_columns() == {"a": [1, 2, 3, 4, 5, 6]}
 
         table.update({"a": [7, 8, 9]})
-        assert s.get() == 5
+        assert s.get() == 2
 
     @mark.skip(
         reason="This method no longer dispatches to the loop_cb because it is sync without an on_update callback"

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/tests/table/test_table.py

@@ -82,6 +82,15 @@ class TestTable:
             "float": [None, 2.5, None],
         }
 
+    def test_table_records_from_string_with_format_override(self):
+        data = '{"x": [1,2,3], "y": [4,5,6]}'
+        tbl = Table(data, format="columns")
+        view = tbl.view()
+        assert view.to_columns() == {
+            "x": [1, 2, 3],
+            "y": [4, 5, 6],
+        }
+
     def test_table_string_column_with_nulls_update_and_filter(self):
         tbl = Table(
             [

{perspective_python-3.0.3 → perspective_python-3.1.1}/perspective/tests/table/test_table_limit.py

@@ -39,3 +39,7 @@ class TestTableInfer(object):
         d2 = t2.view().to_columns()
 
         assert d1 == d2
+
+    def test_table_limit_with_json(self):
+        t = Table({"a": [1, 2, 3]}, limit=1)
+        assert t.size() == 1

perspective_python-3.1.1/perspective/tests/test_dependencies.py

@@ -0,0 +1,46 @@
+#  ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+#  ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+#  ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+#  ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+#  ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+#  ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+#  ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+#  ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+#  ┃ This file is part of the Perspective library, distributed under the terms ┃
+#  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+#  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+import pytest
+
+
+# test that loading perspective and calling a common constructor code path does
+# not load various "expensive" modules. "Expensive" is in quotes because this is
+# utter nonsense.
+@pytest.mark.skip(reason="https://github.com/pyca/bcrypt/issues/694")
+def test_lazy_modules():
+    import sys
+
+    cache = {}
+    for key in list(sys.modules.keys()):
+        if (
+            key.startswith("perspective")
+            or key.startswith("test")
+            or key.startswith("pandas")
+            or key.startswith("pyarrow")
+            or key.startswith("tornado")
+        ):
+            cache[key] = sys.modules[key]
+            del sys.modules[key]
+
+    import perspective
+
+    t1 = perspective.table("x\n1")
+    t1.delete()
+
+    assert "perspective" in sys.modules
+    assert "pandas" not in sys.modules
+    assert "pyarrow" not in sys.modules
+    assert "tornado" not in sys.modules
+
+    for k, v in cache.items():
+        sys.modules[k] = v

{perspective_python-3.0.3 → perspective_python-3.1.1}/perspective/tests/viewer/test_viewer.py

@@ -12,15 +12,13 @@
 
 import numpy as np
 import pandas as pd
-from perspective import PerspectiveViewer
 import pytest
+from perspective.widget.viewer import PerspectiveViewer
 import perspective as psp
 
 client = psp.Server().new_local_client()
 Table = client.table
 
-pytest.skip(allow_module_level=True)
-
 
 class TestViewer:
     def test_viewer_get_table(self):
@@ -38,9 +36,9 @@ class TestViewer:
         assert viewer.columns == ["a"]
 
     def test_viewer_load_named_table(self):
-        table = Table({"a": [1, 2, 3]})
+        table = Table({"a": [1, 2, 3]}, name="data_1")
         viewer = PerspectiveViewer()
-        viewer.load(table, name="data_1")
+        viewer.load(table)
         assert viewer.columns == ["a"]
         assert viewer.table_name == "data_1"
         assert viewer.table == table
@@ -86,18 +84,21 @@ class TestViewer:
         assert viewer.group_by == []
         assert viewer.theme == "Pro Dark"  # should not break UI
 
+    @pytest.mark.skip
     def test_viewer_load_np(self):
         table = Table({"a": np.arange(1, 100)})
         viewer = PerspectiveViewer()
         viewer.load(table)
         assert viewer.columns == ["a"]
 
+    @pytest.mark.skip
     def test_viewer_load_np_data(self):
         viewer = PerspectiveViewer()
         viewer.load({"a": np.arange(1, 100)})
         assert viewer.columns == ["a"]
         assert viewer.table.size() == 99
 
+    @pytest.mark.skip
     def test_viewer_load_df(self):
         table = Table(pd.DataFrame({"a": np.arange(1, 100)}))
         viewer = PerspectiveViewer()

{perspective_python-3.0.3/rust/perspective-python → perspective_python-3.1.1}/perspective/tests/widget/test_widget.py

@@ -13,7 +13,7 @@
 from functools import partial
 from types import MethodType
 import numpy as np
-from perspective import PerspectiveWidget
+from perspective.widget import PerspectiveWidget
 from pytest import raises
 import pytest
 import perspective as psp

{perspective_python-3.0.3 → perspective_python-3.1.1}/perspective/tests/widget/test_widget_pandas.py

@@ -13,7 +13,7 @@
 import pandas as pd
 import numpy as np
 import pytest
-from perspective import PerspectiveWidget
+from perspective.widget import PerspectiveWidget
 import perspective as psp
 
 client = psp.Server().new_local_client()

perspective_python-3.0.3/rust/perspective-python/perspective/widget/widget.py → perspective_python-3.1.1/perspective/widget/__init__.py

@@ -11,15 +11,15 @@
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import base64
-import jinja2
 import logging
 import os
 import re
+import importlib
 
+from string import Template
 from ipywidgets import DOMWidget
 from traitlets import Unicode, observe
-from ..viewer import PerspectiveViewer
-import importlib
+from .viewer import PerspectiveViewer
 
 __version__ = re.sub(
     "(rc|alpha|beta)", "-\\1.", importlib.metadata.version("perspective-python")
@@ -36,7 +36,7 @@ class PerspectiveWidget(DOMWidget, PerspectiveViewer):
     and state is maintained across page refreshes.
 
     Examples:
-        >>> from perspective import Table, PerspectiveWidget
+        >>> from perspective.widget import PerspectiveWidget
         >>> data = {
         ...     "a": [1, 2, 3],
         ...     "b": [
@@ -45,9 +45,8 @@ class PerspectiveWidget(DOMWidget, PerspectiveViewer):
         ...         "2019/07/11 9:30PM"
         ...     ]
         ... }
-        >>> tbl = Table(data, index="a")
         >>> widget = PerspectiveWidget(
-        ...     tbl,
+        ...     data,
         ...     group_by=["a"],
         ...     sort=[["b", "desc"]],
         ...     filter=[["a", ">", 1]]
@@ -57,7 +56,7 @@ class PerspectiveWidget(DOMWidget, PerspectiveViewer):
         >>> widget.sort.append(["a", "asc"])
         >>> widget.sort
         [["b", "desc"], ["a", "asc"]]
-        >>> widget.update({"a": [4, 5]}) # Browser UI updates
+        >>> widget.table.update({"a": [4, 5]}) # Browser UI updates
     """
 
     # Required by ipywidgets for proper registration of the backend
@@ -217,8 +216,9 @@ class PerspectiveWidget(DOMWidget, PerspectiveViewer):
             else:
                 logging.error("No session for client_id {}".format(client_id))
         elif content["type"] == "hangup":
-            # XXX(tom): client won't reliably send this so shouldn't rely on it to clean up; does jupyter notify us
-            # when the client on the websocket, i.e. the view, disconnects?
+            # XXX(tom): client won't reliably send this so shouldn't rely on it
+            # to clean up; does jupyter notify us when the client on the
+            # websocket, i.e. the view, disconnects?
             client_id = content["client_id"]
             logging.debug("view {} hangup", client_id)
             session = self._sessions.pop(client_id, None)
@@ -229,27 +229,36 @@ class PerspectiveWidget(DOMWidget, PerspectiveViewer):
         super_bundle = super(DOMWidget, self)._repr_mimebundle_(**kwargs)
         if not _jupyter_html_export_enabled():
             return super_bundle
+
         # Serialize viewer attrs + view data to be rendered in the template
         viewer_attrs = self.save()
         data = self.table.view().to_arrow()
         b64_data = base64.encodebytes(data)
-
-        jinja_env = jinja2.Environment(
-            loader=jinja2.PackageLoader("perspective"),
-            autoescape=jinja2.select_autoescape(),
+        template_path = os.path.join(
+            os.path.dirname(__file__), "../templates/exported_widget.html.template"
         )
-        template = jinja_env.get_template("exported_widget.html.jinja")
+        with open(template_path, "r") as template_data:
+            template = Template(template_data.read())
 
         def psp_cdn(module, path=None):
             if path is None:
                 path = f"cdn/{module}.js"
+
             # perspective developer affordance: works with your local `pnpm run start blocks`
             # return f"http://localhost:8080/node_modules/@finos/{module}/dist/{path}"
             return f"https://cdn.jsdelivr.net/npm/@finos/{module}@{__version__}/dist/{path}"
 
         return super(DOMWidget, self)._repr_mimebundle_(**kwargs) | {
-            "text/html": template.render(
-                psp_cdn=psp_cdn,
+            "text/html": template.substitute(
+                psp_cdn_perspective=psp_cdn("perspective"),
+                psp_cdn_perspective_viewer=psp_cdn("perspective-viewer"),
+                psp_cdn_perspective_viewer_datagrid=psp_cdn(
+                    "perspective-viewer-datagrid"
+                ),
+                psp_cdn_perspective_viewer_d3fc=psp_cdn("perspective-viewer-d3fc"),
+                psp_cdn_perspective_viewer_themes=psp_cdn(
+                    "perspective-viewer-themes", "css/themes.css"
+                ),
                 viewer_id=self.model_id,
                 viewer_attrs=viewer_attrs,
                 b64_data=b64_data.decode("utf-8"),

{perspective_python-3.0.3/rust/perspective-python/perspective → perspective_python-3.1.1/perspective/widget}/viewer/viewer.py

@@ -180,16 +180,6 @@ class PerspectiveViewer(PerspectiveTraitlets, object):
                 Cannot be set at the same time as `index`. Ignored if a
                 ``Table`` or ``View`` is supplied.
 
-        Examples:
-            >>> from perspective import Table, PerspectiveViewer
-            >>> data = {"a": [1, 2, 3]}
-            >>> tbl = Table(data)
-            >>> viewer = PerspectiveViewer()
-            >>> viewer.load(tbl)
-            >>> viewer.load(data, index="a") # viewer state is reset
-            >>> viewer2 = PerspectiveViewer()
-            >>> viewer2.load(tbl.view())
-
         """
         name = options.pop("name", str(random()))
 
@@ -197,18 +187,17 @@ class PerspectiveViewer(PerspectiveTraitlets, object):
         if self.table is not None:
             self.reset()
 
-        if isinstance(data, perspective.Table):
+        if isinstance(data, perspective.perspective.Table):
             self._table = data
             self._client = data.get_client()
             name = self._table.get_name()
-        elif isinstance(data, perspective.View):
+        elif isinstance(data, perspective.perspective.View):
             raise TypeError(
                 "Views cannot be loaded directly, load a table or raw data instead"
             )
         else:
-            client = perspective.Server().new_local_client()
-            self._table = client.table(data, name=name, **options)
-            self._client = client
+            self._table = perspective.table(data, name=name, **options)
+            self._client = perspective.GLOBAL_CLIENT
 
         # If the user does not set columns to show, synchronize viewer state
         # with dataset.
@@ -313,19 +302,9 @@ class PerspectiveViewer(PerspectiveTraitlets, object):
                 deleted. Defaults to True.
         """
         if delete_table:
-            # XXX(tom): TODO implement delete
-            # Delete all created views on the widget's manager instance
-            # for view in self.manager._views.values():
-            #     view.delete()
-
-            # Reset view cache
-            # self.manager._views = {}
-
             # Delete table
-            raise RuntimeError("XXX(tom): delete not implemented")
             self.table.delete()
-            self.manager._tables.pop(self.table_name)
-            self.table = None
             self.table_name = None
+            self._table = None
 
         self.reset()