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

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

@@ -1783,7 +1783,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "perspective"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "async-lock",
  "axum",
@@ -1823,7 +1823,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-client"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "async-lock",
  "futures",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-js"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1874,7 +1874,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-lint"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "glob",
  "yew-fmt",
@@ -1882,7 +1882,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-python"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "async-lock",
  "cmake",
@@ -1902,7 +1902,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-server"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "async-lock",
  "base64 0.22.1",
@@ -1918,7 +1918,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-viewer"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
  "anyhow",
  "async-lock",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: perspective-python
-Version: 3.0.1
+Version: 3.0.2
 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.2}/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.2"
 __all__ = [
     "_jupyter_labextension_paths",
     "PerspectiveError",
@@ -71,8 +71,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.2}/perspective/psp_cffi.py

@@ -77,7 +77,7 @@ class Session:
         self._server: "ServerBase" = server
         self._session_id = lib.psp_new_session(server._server)
 
-    def __del__(self):
+    def close(self):
         lib.psp_close_session(self._server._server, self._session_id)
 
     def handle_request(self, bytes_msg):

{perspective_python-3.0.1/rust/perspective-python → perspective_python-3.0.2}/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.2}/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.2}/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.2}/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.2}/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.2}/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.2.data"
 features = ["pyo3/extension-module"]
 include = [
     { path = "perspective/*libpsp.so", format = "wheel" },

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

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-client"
-version = "3.0.1"
+version = "3.0.2"
 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.2}/rust/perspective-python/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-python"
-version = "3.0.1"
+version = "3.0.2"
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
 repository = "https://github.com/finos/perspective"
@@ -54,8 +54,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.2", path = "../perspective-client" }
+# perspective-server = { version = "3.0.2", path = "../perspective-server" }
 pollster = "0.3.0"
 extend = "1.1.2"
 futures = "0.3.28"

{perspective_python-3.0.1 → perspective_python-3.0.2}/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.2"
 __all__ = [
     "_jupyter_labextension_paths",
     "PerspectiveError",
@@ -71,8 +71,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.2}/rust/perspective-python/perspective/psp_cffi.py

@@ -77,7 +77,7 @@ class Session:
         self._server: "ServerBase" = server
         self._session_id = lib.psp_new_session(server._server)
 
-    def __del__(self):
+    def close(self):
         lib.psp_close_session(self._server._server, self._session_id)
 
     def handle_request(self, bytes_msg):

{perspective_python-3.0.1 → perspective_python-3.0.2/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.2}/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.2/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.2/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.2}/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.2}/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")]

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

@@ -32,6 +32,7 @@ use pythonize::depythonize_bound;
 pub struct PyClient {
     pub(crate) client: Client,
     loop_cb: Arc<RwLock<Option<Py<PyAny>>>>,
+    close_cb: Py<PyAny>,
 }
 
 #[extend::ext]
@@ -263,7 +264,7 @@ fn pandas_to_arrow_bytes<'py>(
 }
 
 impl PyClient {
-    pub fn new(handle_request: Py<PyAny>) -> Self {
+    pub fn new(handle_request: Py<PyAny>, handle_close: Py<PyAny>) -> Self {
         let client = Client::new_with_callback({
             move |msg| {
                 clone!(handle_request);
@@ -280,6 +281,7 @@ impl PyClient {
         PyClient {
             client,
             loop_cb: Arc::default(),
+            close_cb: handle_close,
         }
     }
 
@@ -359,6 +361,10 @@ impl PyClient {
         *self.loop_cb.write().await = Some(loop_cb);
         Ok(())
     }
+
+    pub async fn terminate(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
+        self.close_cb.call0(py)
+    }
 }
 
 #[derive(Clone)]
@@ -374,10 +380,11 @@ impl PyTable {
         self.table.get_index()
     }
 
-    pub async fn get_client(&self, loop_cb: Option<Py<PyAny>>) -> PyClient {
+    pub async fn get_client(&self) -> PyClient {
         PyClient {
             client: self.table.get_client(),
-            loop_cb: Arc::new(RwLock::new(loop_cb)),
+            loop_cb: self.client.loop_cb.clone(),
+            close_cb: self.client.close_cb.clone(),
         }
     }
 

{perspective_python-3.0.1.data → perspective_python-3.0.2.data}/data/share/jupyter/labextensions/@finos/perspective-jupyterlab/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/perspective-jupyterlab",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A Jupyterlab extension for the Perspective library, designed to be used with perspective-python.",
   "files": [
     "dist/**/*",
@@ -72,7 +72,7 @@
       }
     },
     "_build": {
-      "load": "static/remoteEntry.2d479254617fc3abef25.js",
+      "load": "static/remoteEntry.e6f57cf13491ae730f31.js",
       "extension": "./extension",
       "style": "./style"
     }