upgrade zeromq and runtimelib

This commit is contained in:
Ryan Dahl 2024-07-26 09:18:12 -04:00
parent 7776636c2e
commit 1cdb3e8161
6 changed files with 439 additions and 402 deletions

818
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -191,7 +191,7 @@ url = { version = "< 2.5.0", features = ["serde", "expose_internals"] }
uuid = { version = "1.3.0", features = ["v4"] }
webpki-roots = "0.26"
which = "4.2.5"
zeromq = { version = "=0.3.4", default-features = false, features = ["tcp-transport", "tokio-runtime"] }
zeromq = { version = "=0.4.0", default-features = false, features = ["tcp-transport", "tokio-runtime"] }
zstd = "=0.12.4"
# crypto

View File

@ -116,7 +116,7 @@ hyper-util.workspace = true
import_map = { version = "=0.20.0", features = ["ext"] }
indexmap.workspace = true
jsonc-parser.workspace = true
jupyter_runtime = { package = "runtimelib", version = "=0.11.0" }
jupyter_runtime = { package = "runtimelib", version = "=0.13.0" }
lazy-regex.workspace = true
libc.workspace = true
libz-sys.workspace = true

View File

@ -69,8 +69,7 @@ pub fn op_jupyter_input(
InputRequest {
prompt,
password: is_password,
}
.into(),
},
Some(&last_request),
);

View File

@ -126,7 +126,7 @@ pub async fn kernel(
self
.0
.send(StreamContent::stdout(
String::from_utf8_lossy(buf).into_owned(),
&String::from_utf8_lossy(buf),
))
.ok();
Ok(buf.len())

View File

@ -24,8 +24,8 @@ use tokio::sync::mpsc;
use tokio::sync::oneshot;
use jupyter_runtime::messaging;
use jupyter_runtime::AsChildOf;
use jupyter_runtime::ConnectionInfo;
use jupyter_runtime::ExecutionCount;
use jupyter_runtime::JupyterMessage;
use jupyter_runtime::JupyterMessageContent;
use jupyter_runtime::KernelControlConnection;
@ -475,7 +475,7 @@ impl JupyterServer {
self
.send_iopub(
messaging::ExecuteInput {
execution_count: self.execution_count,
execution_count: ExecutionCount(self.execution_count),
code: execute_request.code.clone(),
}
.as_child_of(parent_message),
@ -503,7 +503,7 @@ impl JupyterServer {
connection
.send(
messaging::ExecuteReply {
execution_count: self.execution_count,
execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Error,
payload: Default::default(),
user_expressions: None,
@ -532,7 +532,7 @@ impl JupyterServer {
connection
.send(
messaging::ExecuteReply {
execution_count: self.execution_count,
execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Ok,
user_expressions: None,
payload: Default::default(),
@ -632,13 +632,13 @@ impl JupyterServer {
connection
.send(
messaging::ExecuteReply {
execution_count: self.execution_count,
execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Error,
error: Some(ReplyError {
error: Some(Box::new(ReplyError {
ename,
evalue,
traceback,
}),
})),
user_expressions: None,
payload: Default::default(),
}