Skip to content

Fix jupyterlab renderers #3059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
texodus merged 1 commit into from
Oct 10, 2025
Merged

Fix jupyterlab renderers #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/perspective-jupyterlab/src/js/psp_widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ export class PerspectiveWidget extends Widget {
* method) must be called in order for its memory to be reclaimed.
*/

delete() {
this.viewer.delete();
async delete() {
await this.viewer.delete();
}

/**
Expand Down
7 changes: 4 additions & 3 deletions packages/perspective-jupyterlab/src/js/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const baddialog = () => {
});
};

const WORKER = perspective.worker();
export class PerspectiveDocumentWidget extends DocumentWidget {
constructor(options, type = "csv") {
super({
Expand Down Expand Up @@ -102,7 +101,8 @@ export class PerspectiveDocumentWidget extends DocumentWidget {
table.replace(data);
} catch (e) {
// construct new table
const table_promise = WORKER.table(data);
this.worker = await perspective.worker();
const table_promise = this.worker.table(data);

// load data
await this._psp.viewer.load(table_promise);
Expand Down Expand Up @@ -151,7 +151,8 @@ export class PerspectiveDocumentWidget extends DocumentWidget {
if (this._monitor) {
this._monitor.dispose();
}
this._psp.delete();

this.worker.terminate();
super.dispose();
}

Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-jupyterlab/src/less/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ div.PSPContainer perspective-viewer[theme="Pro Light"] {

div.PSPContainer perspective-viewer {
display: block;
height: 98%;
height: 100%;
}
88 changes: 58 additions & 30 deletions ...e-jupyterlab/test/jupyter/widget.spec.mts → ...e-jupyterlab/test/jupyter/widget.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,32 @@ const getEditMode = async (viewer) => {
// utils.with_jupyterlab(process.env.__JUPYTERLAB_PORT__, () => {
describe_jupyter(
() => {
test_jupyter(
"Open arrow and csv from file browser",
[],
async ({ page }) => {
await page.locator("#tab-key-1-7").click();
await page
.locator(`.jp-DirListing-item[data-file-type="arrow"]`)
.click({ button: "right" });

await page.hover(`.lm-Menu .lm-Menu-item[data-type="submenu"]`);
await page
.locator(`.lm-Menu-item[data-command="filebrowser:open"]`)
.click();

const num_columns = await page
.locator("regular-table thead tr")
.first()
.evaluate((tr) => tr.childElementCount);

expect(num_columns).toEqual(14);
await expect(
page.locator("regular-table tbody tr"),
).toHaveCount(5);
},
);

// Basics
test_jupyter(
"Loads data",
Expand All @@ -51,9 +77,9 @@ describe_jupyter(

expect(num_columns).toEqual(3);
await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(5);
}
},
);

test_jupyter(
Expand All @@ -78,9 +104,9 @@ describe_jupyter(
expect(num_columns).toEqual(3);

await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(10);
}
},
);

test_jupyter(
Expand All @@ -105,15 +131,16 @@ describe_jupyter(
expect(num_columns).toEqual(3);

await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(5);
}
},
);

test_jupyter(
"Loads AsyncTable",
[
`
import asyncio
server = perspective.Server()
sync_client = server.new_local_client()
sync_client.table({"Income": [5,4,3,2,1], "Expense": [4,3,2,1,1], "Profit": [1,1,1,1,0]}, name="Microstore")
Expand All @@ -133,16 +160,17 @@ async_table = await async_client.open_table("Microstore")`,

expect(num_columns).toEqual(3);
await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(5);
}
},
);

test_jupyter(
"Loads updates to AsyncTable",
[
[
`
import asyncio
server = perspective.Server()
sync_client = server.new_local_client()
sync_table = sync_client.table(arrow_data)
Expand All @@ -165,9 +193,9 @@ async_table = await async_client.open_table(sync_table.get_name())`,
expect(num_columns).toEqual(3);

await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(10);
}
},
);
// Restore

Expand All @@ -189,7 +217,7 @@ async_table = await async_client.open_table(sync_table.get_name())`,
});

expect(settings).toEqual(false);
}
},
);

test_jupyter(
Expand All @@ -207,7 +235,7 @@ async_table = await async_client.open_table(sync_table.get_name())`,
const viewer = await default_body(page);
const edit_mode = await getEditMode(viewer);
expect(edit_mode).toEqual("EDIT");
}
},
);

test_jupyter(
Expand All @@ -228,12 +256,12 @@ async_table = await async_client.open_table(sync_table.get_name())`,

await add_and_execute_cell(
page,
'w.plugin_config = {"edit_mode": "EDIT"}'
'w.plugin_config = {"edit_mode": "EDIT"}',
);

edit_mode = await getEditMode(viewer);
expect(edit_mode).toEqual("EDIT");
}
},
);

test_jupyter(
Expand All @@ -255,14 +283,14 @@ async_table = await async_client.open_table(sync_table.get_name())`,
await viewer.evaluate(async (viewer) => {
const edit =
viewer.children[1].shadowRoot.querySelector(
"span#edit_mode"
"span#edit_mode",
);
edit.click();
});

edit_mode = await getEditMode(viewer);
expect(edit_mode).toEqual("EDIT");
}
},
);

test_jupyter(
Expand Down Expand Up @@ -328,7 +356,7 @@ w.filter = [["i8", "<", 50]]
w.group_by = ["date"]
w.split_by = ["bool"]
w.sort = [["date", "asc"]]
w.theme = "Pro Dark"`
w.theme = "Pro Dark"`,
);

// grab the config again
Expand All @@ -353,7 +381,7 @@ w.theme = "Pro Dark"`
theme: "Pro Dark",
title: null,
});
}
},
);

test_jupyter(
Expand Down Expand Up @@ -439,10 +467,10 @@ assert w.plugin_config == {}
assert w.settings == False
assert w.sort == [["date", "asc"]]
assert w.theme == "Pro Dark"
"Passed"`
"Passed"`,
);
expect(error_cells_dont_exist).toBe(true);
}
},
);

test_jupyter(
Expand All @@ -460,7 +488,7 @@ assert w.theme == "Pro Dark"
[
`assert w.table.view().to_columns() == {'a': [True, False, True], 'b': ['abc', 'def', 'ghi']}`,
`"Passed"`,
].join("\n")
].join("\n"),
);
expect(error_cells_dont_exist).toBe(true);

Expand All @@ -478,11 +506,11 @@ assert w.theme == "Pro Dark"
[
`assert w.table.view().to_columns() == {'a': [False, True, False], 'b': ['abc', 'def', 'ghi']}`,
`"Passed"`,
].join("\n")
].join("\n"),
);

expect(error_cells_dont_exist).toBe(true);
}
},
);

test_jupyter("Restores from saved config", [], async ({ page }) => {
Expand All @@ -496,7 +524,7 @@ table = client.table(arrow_data)
w = perspective.widget.PerspectiveWidget(table)
config = w.save()
perpsective.PerspectiveWidget(df, **config)
`
`,
);
expect(errored).toBe(false);
});
Expand Down Expand Up @@ -530,7 +558,7 @@ perpsective.PerspectiveWidget(df, **config)

await page.evaluate(async () => {
await document
.querySelector("perspective-viewer")!
.querySelector("perspective-viewer")
.flush();
});
}
Expand All @@ -542,9 +570,9 @@ perpsective.PerspectiveWidget(df, **config)

// expect(num_columns).toEqual(3);
await expect(
page.locator("regular-table tbody tr")
page.locator("regular-table tbody tr"),
).toHaveCount(5);
}
},
);

// *************************
Expand All @@ -559,12 +587,12 @@ perpsective.PerspectiveWidget(df, **config)
// assert_no_error_in_cell runs add_and_execute_cell internally so only need to check one
const error_cells_dont_exist = await assert_no_error_in_cell(
page,
"raise Exception('anything')"
"raise Exception('anything')",
);
expect(error_cells_dont_exist).toBe(false);
}
},
);
},
{ name: "Simple", root: path.join(__dirname, "..", "..") }
{ name: "Simple", root: path.join(__dirname, "..", "..") },
);
// });
3 changes: 3 additions & 0 deletions rust/perspective-js/src/ts/wasm/browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ export async function worker(
async () => {
console.debug("Closing WebWorker");
port.close();
if (webworker instanceof Worker) {
webworker.terminate();
}
},
);

Expand Down
Loading