development/deno
development/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno synced 2024-08-28 04:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jupyter): await Jupyter.display evaluation (#20646)

Browse source
This commit is contained in:
Bartek Iwańczuk 2023-09-23 16:30:16 +02:00 committed by GitHub
parent 1ad097c4bf
commit b1ca67ac01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cli/tools/jupyter/server.rs
View file

@ -540,19 +540,29 @@ async fn get_jupyter_display(
evaluate_result: &cdp::RemoteObject,
) -> Result<Option<HashMap<String, serde_json::Value>>, AnyError> {
let response = session
.call_function_on_args(
r#"function (object) {
const display = object[Symbol.for("Jupyter.display")];
if (typeof display === "function") {
return JSON.stringify(display());
} else {
return null;
}
}"#
.to_string(),
&[evaluate_result.clone()],
.post_message_with_event_loop(
"Runtime.callFunctionOn",
Some(json!({
"functionDeclaration": r#"function (object) {
const display = object[Symbol.for("Jupyter.display")];
if (typeof display !== "function") {
return null;
}
try {
return JSON.stringify(display());
} catch {
return null;
}
}"#,
"arguments": [cdp::CallArgument::from(evaluate_result)],
"executionContextId": session.context_id,
"awaitPromise": true,
})),
)
.await?;
let response: cdp::CallFunctionOnResponse = serde_json::from_value(response)?;
if let Some(exception_details) = &response.exception_details {
// If the object doesn't have a Jupyter.display method or it throws an
@ -599,8 +609,12 @@ async fn get_jupyter_display_or_eval_value(
return Ok(HashMap::default());
}
if let Some(data) = get_jupyter_display(session, evaluate_result).await? {
return Ok(data);
// If the response is a primitive value we don't need to try and format
// Jupyter response.
if evaluate_result.object_id.is_some() {
if let Some(data) = get_jupyter_display(session, evaluate_result).await? {
return Ok(data);
}
}
let response = session