development/deno
development/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno synced 2024-08-27 20:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(jupyter-kernel): accept nested objects from display calls (#20537)

Browse source 
Closes #20535.

# Screenshots

## JSON
<img width="779" alt="image"
src="https://github.com/denoland/deno/assets/836375/668bb1a6-3f76-4b36-974e-cdc6c93f94c3">

## Vegalite

<img width="558" alt="image"
src="https://github.com/denoland/deno/assets/836375/a5e70908-6b87-42d8-85c3-1323ad52a00f">

# Implementation

Instead of going the route of recursively getting all the objects under
`application/.*json` keys, I went with `JSON.stringify`ing in denospace
then parsing it from rust. One of the key benefits of serializing and
deserializing is that non-JSON-able entries will get stripped
automatically. This also keeps the code pretty simple.

In the future we should _only_ do this for `application/.*json` keys.

cc @mmastrac
This commit is contained in:
Kyle Kelley 2023-09-17 09:38:52 -07:00 committed by GitHub
parent 23bf05cff2
commit 81d6ea8e11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -480,57 +480,34 @@ async fn get_jupyter_display(
session: &mut repl::ReplSession,
evaluate_result: &cdp::RemoteObject,
) -> Result<Option<HashMap<String, serde_json::Value>>, AnyError> {
let mut data = HashMap::default();
let response = session
.call_function_on_args(
r#"function (object) {{
return object[Symbol.for("Jupyter.display")]();
}}"#
return JSON.stringify(object[Symbol.for("Jupyter.display")]());
}}"#
.to_string(),
&[evaluate_result.clone()],
)
.await?;
if response.exception_details.is_some() {
if let Some(exception_details) = &response.exception_details {
// TODO(rgbkrk): Return an error in userspace instead of Jupyter logs
eprintln!("Exception encountered: {}", exception_details.text);
return Ok(None);
}
let object_id = response.result.object_id.unwrap();
if let Some(serde_json::Value::String(json_str)) = response.result.value {
let data: HashMap<String, serde_json::Value> =
serde_json::from_str(&json_str)?;
let get_properties_response_result = session
.post_message_with_event_loop(
"Runtime.getProperties",
Some(cdp::GetPropertiesArgs {
object_id,
own_properties: Some(true),
accessor_properties_only: None,
generate_preview: None,
non_indexed_properties_only: Some(true),
}),
)
.await;
let Ok(get_properties_response) = get_properties_response_result else {
return Ok(None);
};
let get_properties_response: cdp::GetPropertiesResponse =
serde_json::from_value(get_properties_response).unwrap();
for prop in get_properties_response.result.into_iter() {
if let Some(value) = &prop.value {
data.insert(
prop.name.to_string(),
value
.value
.clone()
.unwrap_or_else(|| serde_json::Value::Null),
);
if !data.is_empty() {
return Ok(Some(data));
}
}
if !data.is_empty() {
return Ok(Some(data));
} else {
eprintln!(
"Unexpected response from Jupyter.display: {:?}",
response.result.clone().value
);
}
Ok(None)