Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create RunningKernel trait to allow for native and remote jupyter kernels (#20842)

Browse source 
Starts setting up a `RunningKernel` trait to make the remote kernel
implementation easy to get started with. No release notes until this is
all hooked up.

Release Notes:

- N/A
This commit is contained in:
Kyle Kelley 2024-11-18 18:12:23 -08:00 • committed by GitHub
parent 343c88574a
commit bd0f197415
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 1600 additions and 1088 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/repl/src/session.rs
View file

@ -1,7 +1,7 @@
use crate::components::KernelListItem;
use crate::setup_editor_session_actions;
use crate::{
kernels::{Kernel, KernelSpecification, RunningKernel},
kernels::{Kernel, KernelSpecification, NativeRunningKernel},
outputs::{ExecutionStatus, ExecutionView},
KernelStatus,
};
@ -246,13 +246,19 @@ impl Session {
cx.entity_id().to_string(),
);
let kernel = RunningKernel::new(
self.kernel_specification.clone(),
entity_id,
working_directory,
self.fs.clone(),
cx,
);
let kernel = match self.kernel_specification.clone() {
KernelSpecification::Jupyter(kernel_specification)
| KernelSpecification::PythonEnv(kernel_specification) => NativeRunningKernel::new(
kernel_specification,
entity_id,
working_directory,
self.fs.clone(),
cx,
),
KernelSpecification::Remote(_remote_kernel_specification) => {
unimplemented!()
}
};
let pending_kernel = cx
.spawn(|this, mut cx| async move {
@ -291,7 +297,7 @@ impl Session {
.detach();
let status = kernel.process.status();
session.kernel(Kernel::RunningKernel(kernel), cx);
session.kernel(Kernel::RunningKernel(Box::new(kernel)), cx);
let process_status_task = cx.spawn(|session, mut cx| async move {
let error_message = match status.await {
@ -416,7 +422,7 @@ impl Session {
fn send(&mut self, message: JupyterMessage, _cx: &mut ViewContext<Self>) -> anyhow::Result<()> {
if let Kernel::RunningKernel(kernel) = &mut self.kernel {
kernel.request_tx.try_send(message).ok();
kernel.request_tx().try_send(message).ok();
}
anyhow::Ok(())
@ -631,7 +637,7 @@ impl Session {
match kernel {
Kernel::RunningKernel(mut kernel) => {
let mut request_tx = kernel.request_tx.clone();
let mut request_tx = kernel.request_tx().clone();
cx.spawn(|this, mut cx| async move {
let message: JupyterMessage = ShutdownRequest { restart: false }.into();
@ -646,7 +652,7 @@ impl Session {
})
.ok();
kernel.process.kill().ok();
kernel.force_shutdown().ok();
this.update(&mut cx, |session, cx| {
session.clear_outputs(cx);
@ -674,7 +680,7 @@ impl Session {
// Do nothing if already restarting
}
Kernel::RunningKernel(mut kernel) => {
let mut request_tx = kernel.request_tx.clone();
let mut request_tx = kernel.request_tx().clone();
cx.spawn(|this, mut cx| async move {
// Send shutdown request with restart flag
@ -692,7 +698,7 @@ impl Session {
cx.background_executor().timer(Duration::from_secs(1)).await;
// Force kill the kernel if it hasn't shut down
kernel.process.kill().ok();
kernel.force_shutdown().ok();
// Start a new kernel
this.update(&mut cx, |session, cx| {
@ -727,7 +733,7 @@ impl Render for Session {
let (status_text, interrupt_button) = match &self.kernel {
Kernel::RunningKernel(kernel) => (
kernel
.kernel_info
.kernel_info()
.as_ref()
.map(|info| info.language_info.name.clone()),
Some(
@ -747,7 +753,7 @@ impl Render for Session {
KernelListItem::new(self.kernel_specification.clone())
.status_color(match &self.kernel {
Kernel::RunningKernel(kernel) => match kernel.execution_state {
Kernel::RunningKernel(kernel) => match kernel.execution_state() {
ExecutionState::Idle => Color::Success,
ExecutionState::Busy => Color::Modified,
},