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

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

@@ -278,9 +278,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cc"
@@ -1783,7 +1783,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "perspective"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "async-lock",
  "axum",
@@ -1823,7 +1823,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-client"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "async-lock",
  "futures",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-js"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1874,7 +1874,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-lint"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "glob",
  "yew-fmt",
@@ -1882,15 +1882,15 @@ dependencies = [
 
 [[package]]
 name = "perspective-python"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "async-lock",
  "cmake",
- "cxx-build",
  "extend",
  "futures",
  "num_cpus",
  "perspective-client",
+ "perspective-server",
  "pollster",
  "pyo3",
  "pyo3-build-config 0.20.3",
@@ -1902,14 +1902,13 @@ dependencies = [
 
 [[package]]
 name = "perspective-server"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "async-lock",
  "base64 0.22.1",
  "cmake",
- "cxx",
- "cxx-build",
  "futures",
+ "link-cplusplus",
  "num_cpus",
  "perspective-client",
  "regex",
@@ -1918,7 +1917,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-viewer"
-version = "3.0.1"
+version = "3.0.3"
 dependencies = [
  "anyhow",
  "async-lock",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: perspective-python
-Version: 3.0.1
+Version: 3.0.3
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{perspective_python-3.0.1 → perspective_python-3.0.3}/perspective/__init__.py

@@ -10,7 +10,7 @@
 #  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-__version__ = "3.0.1"
+__version__ = "3.0.3"
 __all__ = [
     "_jupyter_labextension_paths",
     "PerspectiveError",
@@ -30,12 +30,13 @@ from .perspective import (
     Table,
     View,
     ProxySession,
+    PySyncServer,
 )
 
 from .widget import PerspectiveWidget
 from .viewer import PerspectiveViewer
 
-from .psp_cffi import ServerBase
+# from .psp_cffi import ServerBase
 
 try:
     from .handlers import PerspectiveTornadoHandler
@@ -47,7 +48,7 @@ def default_loop_cb(fn, *args, **kwargs):
     return fn(*args, **kwargs)
 
 
-class Server(ServerBase):
+class Server(PySyncServer):
     def set_threadpool_size(self, n_cpus):
         pass
 
@@ -71,8 +72,11 @@ class Client(PySyncClient):
         def handle_response(bytes):
             client.handle_response(bytes)
 
+        def handle_close():
+            session.close()
+
         session = server.new_session(handle_response)
-        client = Client(handle_request)
+        client = Client(handle_request, handle_close)
         return client
 
 

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

@@ -48,7 +48,6 @@ class TestAsync(object):
     @classmethod
     def setup_class(cls):
         cls.loop = tornado.ioloop.IOLoop()
-        cls.loop.make_current()
         cls.thread = threading.Thread(target=cls.loop.start)
         cls.thread.daemon = True
         cls.thread.start()
@@ -56,7 +55,6 @@ class TestAsync(object):
     @classmethod
     def teardown_class(cls):
         cls.loop.add_callback(lambda: tornado.ioloop.IOLoop.current().stop())
-        cls.loop.clear_current()
         cls.thread.join()
         cls.loop.close(all_fds=True)
 

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

@@ -43,6 +43,12 @@ class TestServer(object):
         table2 = client.open_table("table1")
         assert table2.schema() == {"a": "integer", "b": "string"}
 
+    def test_session_close(self):
+        server = Server()
+        client = Client.from_server(server)
+        client.table(data)
+        client.terminate()
+
     def test_server_host(self):
         server = Server()
         client = Client.from_server(server)

{perspective_python-3.0.1/rust/perspective-python → perspective_python-3.0.3}/perspective/tests/server/test_session.py

@@ -32,7 +32,7 @@ class TestProxySession(object):
             sub_client.handle_response(bytes)
 
         sub_session = ProxySession(client, handle_response)
-        sub_client = Client(handle_request)
+        sub_client = Client(handle_request, sub_session.close)
         table = sub_client.table(data, name="table1")
         assert table.schema() == {"a": "integer", "b": "string"}
 
@@ -47,7 +47,7 @@ class TestProxySession(object):
             sub_client.handle_response(bytes)
 
         sub_session = ProxySession(client, handle_response)
-        sub_client = Client(handle_request)
+        sub_client = Client(handle_request, sub_session.close)
         table = sub_client.table(data, name="table1")
         table2 = client.open_table("table1")
         assert table.size() == 3

{perspective_python-3.0.1/rust/perspective-python → perspective_python-3.0.3}/perspective/tests/table/test_table_pandas.py

@@ -117,7 +117,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_infer_date(self, util):
-        data = util.make_dataframe(freq="M")
+        data = util.make_dataframe(freq="ME")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -143,7 +143,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_infer_date_fixed(self, util):
-        data = util.make_dataframe(freq="M")
+        data = util.make_dataframe(freq="ME")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -169,7 +169,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_infer_time(self, util):
-        data = util.make_dataframe(freq="H")
+        data = util.make_dataframe(freq="h")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -196,7 +196,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_year_start_index(self, util):
-        data = util.make_dataframe(freq="AS")
+        data = util.make_dataframe(freq="YS")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -222,7 +222,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_year_start_index_fixed(self, util):
-        data = util.make_dataframe(freq="AS")
+        data = util.make_dataframe(freq="YS")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -249,7 +249,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_quarter_index(self, util):
-        data = util.make_dataframe(size=4, freq="Q")
+        data = util.make_dataframe(size=4, freq="QE")
 
         tbl = Table(data)
         assert tbl.size() == 4
@@ -269,7 +269,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_quarter_index_fixed(self, util):
-        data = util.make_dataframe(size=4, freq="Q")
+        data = util.make_dataframe(size=4, freq="QE")
 
         tbl = Table(data)
         assert tbl.size() == 4

{perspective_python-3.0.1 → perspective_python-3.0.3}/perspective/viewer/viewer_traitlets.py

@@ -52,7 +52,7 @@ class PerspectiveTraitlets(HasTraits):
     table_name = Unicode(None, allow_none=True).tag(sync=True)
 
     server = Bool(False).tag(sync=True)
-    binding_mode = Enum(("server", "client-server"), default="server").tag(sync=True)
+    binding_mode = Enum(("server", "client-server")).tag(default="server", sync=True)
     title = Unicode(None, allow_none=True).tag(sync=True)
     version = Unicode(__version__).tag(sync=True)
 

{perspective_python-3.0.1 → perspective_python-3.0.3}/pyproject.toml

@@ -37,7 +37,7 @@ dependencies = ["Jinja2>=2.0,<4", "ipywidgets>=7.5.1,<9"]
 
 [tool.maturin]
 module-name = "perspective"
-data = "perspective_python-3.0.1.data"
+data = "perspective_python-3.0.3.data"
 features = ["pyo3/extension-module"]
 include = [
     { path = "perspective/*libpsp.so", format = "wheel" },

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-client/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-client"
-version = "3.0.1"
+version = "3.0.3"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-client/src/rust/config/plugin.rs

@@ -46,9 +46,11 @@ pub struct DefaultStyleAttributes {
     pub bool: serde_json::Value,
 }
 
-/// The data needed to populate a column's settings. These are typically default
-/// values, a listing of possible values, or other basic configuration settings
-/// for the plugin. This is the result of calling plugin.plugin_attributes
+/// The data needed to populate a column's settings.
+///
+/// These are typically default values, a listing of possible values, or other
+/// basic configuration settings for the plugin. This is the result of calling
+/// plugin.plugin_attributes
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct PluginAttributes {
     pub symbol: Option<SymbolAttributes>,
@@ -64,4 +66,4 @@ pub struct PluginConfig {
     /// Refers to the currently active columns. Maps name to configuration.
     #[serde(default)]
     pub columns: HashMap<String, serde_json::Value>,
-}
+}

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-client/src/rust/session.rs

@@ -22,12 +22,12 @@ use crate::{Client, ClientError};
 #[cfg(doc)]
 use crate::{Table, View};
 
-/// The server-side representation of a connection to a
-/// [`Client`]. For each [`Client`] that
-/// wants to connect to a `perspective_server::Server`, a dedicated [`Session`]
-/// must be created. The [`Session`] handles routing messages emitted by the
-/// `perspective_server::Server`ve_server::Server`, as well as owning any
-/// resources the [`Client`] may request.
+/// The server-side representation of a connection to a [`Client`].
+///
+/// For each [`Client`] that wants to connect to a `perspective_server::Server`,
+/// a dedicated [`Session`] must be created. The [`Session`] handles routing
+/// messages emitted by the `perspective_server::Server`ve_server::Server`, as
+/// well as owning any resources the [`Client`] may request.
 pub trait Session<E> {
     /// Handle an incoming request from the [`Client`]. Calling
     /// [`Session::handle_request`] will result in the `send_response` parameter

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-client/src/rust/table.rs

@@ -32,9 +32,7 @@ use crate::view::View;
 pub type Schema = HashMap<String, ColumnType>;
 
 /// Options which impact the behavior of [`Client::table`], as well as
-/// subsequent calls to [`Table::update`], even though this latter method
-/// itself does not take [`TableInitOptions`] as an argument, since this
-/// parameter is fixed at creation.
+/// subsequent calls to [`Table::update`].
 #[derive(Clone, Debug, Default, Serialize, Deserialize, TS)]
 pub struct TableInitOptions {
     #[serde(default)]

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-python/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-python"
-version = "3.0.1"
+version = "3.0.3"
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
 repository = "https://github.com/finos/perspective"
@@ -20,18 +20,16 @@ license = "Apache-2.0"
 homepage = "https://perspective.finos.org"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 keywords = []
-build = "build/main.rs"
+build = "build.rs"
 include = [
     "bench/**/*.py",
-    "build/**/*",
+    "build.rs",
     "./Cargo.toml",
     "./package.json",
     "perspective/**/*.py",
     "./pyproject.toml",
     "src/**/*.rs",
     "docs/**/*",
-    "cpp/**/*",
-    "cmake/**/*",
 ]
 
 [package.metadata.docs.rs]
@@ -39,14 +37,15 @@ rustdoc-args = ["--html-in-header", "docs/index.html"]
 
 [features]
 default = []
-sdist = []
-external-cpp = ["perspective-client/external-proto"]
+external-cpp = [
+    "perspective-client/external-proto",
+    "perspective-server/external-cpp",
+]
 
 [lib]
 crate-type = ["cdylib"]
 
 [build-dependencies]
-cxx-build = "1.0.115"
 cmake = "0.1.50"
 num_cpus = "^1.16.0"
 pyo3-build-config = "0.20.2"
@@ -54,8 +53,8 @@ python-config-rs = "0.1.2"
 
 [dependencies]
 async-lock = "2.5.0"
-perspective-client = { version = "3.0.1", path = "../perspective-client" }
-# perspective-server = { version = "3.0.1", path = "../perspective-server" }
+perspective-client = { version = "3.0.3", path = "../perspective-client" }
+perspective-server = { version = "3.0.3", path = "../perspective-server" }
 pollster = "0.3.0"
 extend = "1.1.2"
 futures = "0.3.28"

perspective_python-3.0.3/rust/perspective-python/build.rs

@@ -0,0 +1,31 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ 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). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use std::error::Error;
+
+fn main() -> Result<(), Box<dyn Error>> {
+    pyo3_build_config::add_extension_module_link_args();
+
+    // Pass the `perspective_client` links metadata flag so that the `inherit_docs`
+    // macro can find the path to the docs.
+    println!(
+        "cargo:rustc-env=PERSPECTIVE_CLIENT_DOCS_PATH={}",
+        std::env::var("DEP_PERSPECTIVE_CLIENT_DOCS_PATH").unwrap()
+    );
+
+    if std::option_env!("PSP_DISABLE_CPP").is_some() {
+        return Ok(());
+    }
+
+    std::env::set_var("CARGO_FEATURE_PYTHON", "1");
+    Ok(())
+}

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

@@ -10,7 +10,7 @@
 #  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-__version__ = "3.0.1"
+__version__ = "3.0.3"
 __all__ = [
     "_jupyter_labextension_paths",
     "PerspectiveError",
@@ -30,12 +30,13 @@ from .perspective import (
     Table,
     View,
     ProxySession,
+    PySyncServer,
 )
 
 from .widget import PerspectiveWidget
 from .viewer import PerspectiveViewer
 
-from .psp_cffi import ServerBase
+# from .psp_cffi import ServerBase
 
 try:
     from .handlers import PerspectiveTornadoHandler
@@ -47,7 +48,7 @@ def default_loop_cb(fn, *args, **kwargs):
     return fn(*args, **kwargs)
 
 
-class Server(ServerBase):
+class Server(PySyncServer):
     def set_threadpool_size(self, n_cpus):
         pass
 
@@ -71,8 +72,11 @@ class Client(PySyncClient):
         def handle_response(bytes):
             client.handle_response(bytes)
 
+        def handle_close():
+            session.close()
+
         session = server.new_session(handle_response)
-        client = Client(handle_request)
+        client = Client(handle_request, handle_close)
         return client
 
 

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

@@ -48,7 +48,6 @@ class TestAsync(object):
     @classmethod
     def setup_class(cls):
         cls.loop = tornado.ioloop.IOLoop()
-        cls.loop.make_current()
         cls.thread = threading.Thread(target=cls.loop.start)
         cls.thread.daemon = True
         cls.thread.start()
@@ -56,7 +55,6 @@ class TestAsync(object):
     @classmethod
     def teardown_class(cls):
         cls.loop.add_callback(lambda: tornado.ioloop.IOLoop.current().stop())
-        cls.loop.clear_current()
         cls.thread.join()
         cls.loop.close(all_fds=True)
 

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-python/perspective/tests/server/test_server.py

@@ -43,6 +43,12 @@ class TestServer(object):
         table2 = client.open_table("table1")
         assert table2.schema() == {"a": "integer", "b": "string"}
 
+    def test_session_close(self):
+        server = Server()
+        client = Client.from_server(server)
+        client.table(data)
+        client.terminate()
+
     def test_server_host(self):
         server = Server()
         client = Client.from_server(server)

{perspective_python-3.0.1 → perspective_python-3.0.3/rust/perspective-python}/perspective/tests/server/test_session.py

@@ -32,7 +32,7 @@ class TestProxySession(object):
             sub_client.handle_response(bytes)
 
         sub_session = ProxySession(client, handle_response)
-        sub_client = Client(handle_request)
+        sub_client = Client(handle_request, sub_session.close)
         table = sub_client.table(data, name="table1")
         assert table.schema() == {"a": "integer", "b": "string"}
 
@@ -47,7 +47,7 @@ class TestProxySession(object):
             sub_client.handle_response(bytes)
 
         sub_session = ProxySession(client, handle_response)
-        sub_client = Client(handle_request)
+        sub_client = Client(handle_request, sub_session.close)
         table = sub_client.table(data, name="table1")
         table2 = client.open_table("table1")
         assert table.size() == 3

{perspective_python-3.0.1 → perspective_python-3.0.3/rust/perspective-python}/perspective/tests/table/test_table_pandas.py

@@ -117,7 +117,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_infer_date(self, util):
-        data = util.make_dataframe(freq="M")
+        data = util.make_dataframe(freq="ME")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -143,7 +143,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_infer_date_fixed(self, util):
-        data = util.make_dataframe(freq="M")
+        data = util.make_dataframe(freq="ME")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -169,7 +169,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_infer_time(self, util):
-        data = util.make_dataframe(freq="H")
+        data = util.make_dataframe(freq="h")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -196,7 +196,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_year_start_index(self, util):
-        data = util.make_dataframe(freq="AS")
+        data = util.make_dataframe(freq="YS")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -222,7 +222,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_year_start_index_fixed(self, util):
-        data = util.make_dataframe(freq="AS")
+        data = util.make_dataframe(freq="YS")
 
         tbl = Table(data)
         assert tbl.size() == 10
@@ -249,7 +249,7 @@ class TestTablePandas(object):
 
     @mark.skip(reason="pyarrow dataframe does not support date inference")
     def test_table_dataframe_quarter_index(self, util):
-        data = util.make_dataframe(size=4, freq="Q")
+        data = util.make_dataframe(size=4, freq="QE")
 
         tbl = Table(data)
         assert tbl.size() == 4
@@ -269,7 +269,7 @@ class TestTablePandas(object):
         ]
 
     def test_table_dataframe_quarter_index_fixed(self, util):
-        data = util.make_dataframe(size=4, freq="Q")
+        data = util.make_dataframe(size=4, freq="QE")
 
         tbl = Table(data)
         assert tbl.size() == 4

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-python/perspective/viewer/viewer_traitlets.py

@@ -52,7 +52,7 @@ class PerspectiveTraitlets(HasTraits):
     table_name = Unicode(None, allow_none=True).tag(sync=True)
 
     server = Bool(False).tag(sync=True)
-    binding_mode = Enum(("server", "client-server"), default="server").tag(sync=True)
+    binding_mode = Enum(("server", "client-server")).tag(default="server", sync=True)
     title = Unicode(None, allow_none=True).tag(sync=True)
     version = Unicode(__version__).tag(sync=True)
 

{perspective_python-3.0.1 → perspective_python-3.0.3}/rust/perspective-python/src/client/client_sync.rs

@@ -84,8 +84,8 @@ pub struct Client(PyClient);
 #[pymethods]
 impl Client {
     #[new]
-    pub fn new(callback: Py<PyAny>) -> PyResult<Self> {
-        let client = PyClient::new(callback);
+    pub fn new(handle_request: Py<PyAny>, close_cb: Py<PyAny>) -> PyResult<Self> {
+        let client = PyClient::new(handle_request, close_cb);
         Ok(Client(client))
     }
 
@@ -124,6 +124,11 @@ impl Client {
     pub fn set_loop_callback(&self, loop_cb: Py<PyAny>) -> PyResult<()> {
         self.0.set_loop_cb(loop_cb).block_on()
     }
+
+    #[doc = crate::inherit_docs!("client/terminate.md")]
+    pub fn terminate(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
+        self.0.terminate(py).block_on()
+    }
 }
 
 #[doc = crate::inherit_docs!("table.md")]
@@ -140,8 +145,8 @@ impl Table {
     }
 
     #[doc = crate::inherit_docs!("table/get_client.md")]
-    pub fn get_client(&self, loop_cb: Option<Py<PyAny>>) -> Client {
-        Client(self.0.get_client(loop_cb).block_on())
+    pub fn get_client(&self) -> Client {
+        Client(self.0.get_client().block_on())
     }
 
     #[doc = crate::inherit_docs!("table/get_client.md")]
@@ -212,7 +217,6 @@ impl Table {
 
     #[doc = crate::inherit_docs!("table/size.md")]
     pub fn size(&self, py: Python<'_>) -> PyResult<usize> {
-        tracing::error!("WIP");
         self.0.size().py_block_on(py)
     }