Streamline handling of Shell replies #575
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crates/amalthea/src/socket/shell.rs
Outdated
| @@ -145,7 +147,7 @@ impl Shell { | |||
| self.handle_request(req, |h, r| self.handle_comm_info_request(h, r)) | |||
There was a problem hiding this comment.
Your change to remove handle_request() from handle_comm_msg() below implies we could also do it here with handle_comm_info_request(), because it doesn't use the shell_handler either?
But unlike handle_comm_msg(), handle_comm_info_request() does have a return value it needs to send back. So that makes things complicated.
lionel-
force-pushed
the
upkeep/shell-types
branch
2 times, most recently
from
9b48d46 to
34c58a7
Compare
lionel-
force-pushed
the
upkeep/shell-types
branch
from
34c58a7 to
611894b
Compare
DavisVaughan
approved these changes
Oct 11, 2024
crates/amalthea/src/kernel.rs
Outdated
Comment on lines
108
to
109
| let lsp_handler_clone = lsp_handler.clone(); | ||
| let dap_handler_clone = dap_handler.clone(); |
There was a problem hiding this comment.
While we are here - these don't need to be clones either!
There was a problem hiding this comment.
I wish the compiler would let us know.
| comm_id: req.content.comm_id.clone(), | ||
| }); | ||
| self.iopub_tx.send(reply).unwrap(); | ||
| log::warn!("Failed to open comm: {err:?}"); |
There was a problem hiding this comment.
Warn otherwise this shows up in the test output.
So it's obvious which channel is used
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some clean ups following discussion in #547.
Shell handlers now return an
amalthea::Result.New
amalthea::Error::ShellErrorReplyvariant for error replies. When a handler returns one, it's forwarded to the client as a Shell reply.The
amalthea::Error::ShellErrorExecuteReplyvariant is specifically for execution replies as they are the only ones that need an execution count.(This count is currently created by the R thread. We might want to move some of this handling to the Shell socket: it could create it, bump it when appropriate, etc. The Shell socket might also become in charge of sending Inputs and Results to IOPub to remove as many protocol details from Ark as possible).
Removed the
ExecuteResponseenum as we now pass that information through anamalthea::Result.New
Shell::send_execute_error()method. Sends errors for execute requests with the execution count.Shell::handle_request()is now in charge of sending replies from handlers. All errors, including internal (i.e. not the two variants discussed above) are forwarded to the frontend as replies.