There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
241 lines
7.7 KiB
Rust
241 lines
7.7 KiB
Rust
mod native_kernel;
|
|
use std::{fmt::Debug, future::Future, path::PathBuf};
|
|
|
|
use futures::{
|
|
channel::mpsc::{self, Receiver},
|
|
future::Shared,
|
|
stream,
|
|
};
|
|
use gpui::{App, Entity, Task, Window};
|
|
use language::LanguageName;
|
|
pub use native_kernel::*;
|
|
|
|
mod remote_kernels;
|
|
use project::{Project, WorktreeId};
|
|
pub use remote_kernels::*;
|
|
|
|
use anyhow::Result;
|
|
use jupyter_protocol::JupyterKernelspec;
|
|
use runtimelib::{ExecutionState, JupyterMessage, KernelInfoReply};
|
|
use ui::{Icon, IconName, SharedString};
|
|
|
|
pub type JupyterMessageChannel = stream::SelectAll<Receiver<JupyterMessage>>;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub enum KernelSpecification {
|
|
Remote(RemoteKernelSpecification),
|
|
Jupyter(LocalKernelSpecification),
|
|
PythonEnv(LocalKernelSpecification),
|
|
}
|
|
|
|
impl KernelSpecification {
|
|
pub fn name(&self) -> SharedString {
|
|
match self {
|
|
Self::Jupyter(spec) => spec.name.clone().into(),
|
|
Self::PythonEnv(spec) => spec.name.clone().into(),
|
|
Self::Remote(spec) => spec.name.clone().into(),
|
|
}
|
|
}
|
|
|
|
pub fn type_name(&self) -> SharedString {
|
|
match self {
|
|
Self::Jupyter(_) => "Jupyter".into(),
|
|
Self::PythonEnv(_) => "Python Environment".into(),
|
|
Self::Remote(_) => "Remote".into(),
|
|
}
|
|
}
|
|
|
|
pub fn path(&self) -> SharedString {
|
|
SharedString::from(match self {
|
|
Self::Jupyter(spec) => spec.path.to_string_lossy().to_string(),
|
|
Self::PythonEnv(spec) => spec.path.to_string_lossy().to_string(),
|
|
Self::Remote(spec) => spec.url.to_string(),
|
|
})
|
|
}
|
|
|
|
pub fn language(&self) -> SharedString {
|
|
SharedString::from(match self {
|
|
Self::Jupyter(spec) => spec.kernelspec.language.clone(),
|
|
Self::PythonEnv(spec) => spec.kernelspec.language.clone(),
|
|
Self::Remote(spec) => spec.kernelspec.language.clone(),
|
|
})
|
|
}
|
|
|
|
pub fn icon(&self, cx: &App) -> Icon {
|
|
let lang_name = match self {
|
|
Self::Jupyter(spec) => spec.kernelspec.language.clone(),
|
|
Self::PythonEnv(spec) => spec.kernelspec.language.clone(),
|
|
Self::Remote(spec) => spec.kernelspec.language.clone(),
|
|
};
|
|
|
|
file_icons::FileIcons::get(cx)
|
|
.get_icon_for_type(&lang_name.to_lowercase(), cx)
|
|
.map(Icon::from_path)
|
|
.unwrap_or(Icon::new(IconName::ReplNeutral))
|
|
}
|
|
}
|
|
|
|
pub fn python_env_kernel_specifications(
|
|
project: &Entity<Project>,
|
|
worktree_id: WorktreeId,
|
|
cx: &mut App,
|
|
) -> impl Future<Output = Result<Vec<KernelSpecification>>> {
|
|
let python_language = LanguageName::new("Python");
|
|
let toolchains = project
|
|
.read(cx)
|
|
.available_toolchains(worktree_id, python_language, cx);
|
|
let background_executor = cx.background_executor().clone();
|
|
|
|
async move {
|
|
let toolchains = if let Some(toolchains) = toolchains.await {
|
|
toolchains
|
|
} else {
|
|
return Ok(Vec::new());
|
|
};
|
|
|
|
let kernelspecs = toolchains.toolchains.into_iter().map(|toolchain| {
|
|
background_executor.spawn(async move {
|
|
let python_path = toolchain.path.to_string();
|
|
|
|
// Check if ipykernel is installed
|
|
let ipykernel_check = util::command::new_smol_command(&python_path)
|
|
.args(&["-c", "import ipykernel"])
|
|
.output()
|
|
.await;
|
|
|
|
if ipykernel_check.is_ok() && ipykernel_check.unwrap().status.success() {
|
|
// Create a default kernelspec for this environment
|
|
let default_kernelspec = JupyterKernelspec {
|
|
argv: vec![
|
|
python_path.clone(),
|
|
"-m".to_string(),
|
|
"ipykernel_launcher".to_string(),
|
|
"-f".to_string(),
|
|
"{connection_file}".to_string(),
|
|
],
|
|
display_name: toolchain.name.to_string(),
|
|
language: "python".to_string(),
|
|
interrupt_mode: None,
|
|
metadata: None,
|
|
env: None,
|
|
};
|
|
|
|
Some(KernelSpecification::PythonEnv(LocalKernelSpecification {
|
|
name: toolchain.name.to_string(),
|
|
path: PathBuf::from(&python_path),
|
|
kernelspec: default_kernelspec,
|
|
}))
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
});
|
|
|
|
let kernel_specs = futures::future::join_all(kernelspecs)
|
|
.await
|
|
.into_iter()
|
|
.flatten()
|
|
.collect();
|
|
|
|
anyhow::Ok(kernel_specs)
|
|
}
|
|
}
|
|
|
|
pub trait RunningKernel: Send + Debug {
|
|
fn request_tx(&self) -> mpsc::Sender<JupyterMessage>;
|
|
fn working_directory(&self) -> &PathBuf;
|
|
fn execution_state(&self) -> &ExecutionState;
|
|
fn set_execution_state(&mut self, state: ExecutionState);
|
|
fn kernel_info(&self) -> Option<&KernelInfoReply>;
|
|
fn set_kernel_info(&mut self, info: KernelInfoReply);
|
|
fn force_shutdown(&mut self, window: &mut Window, cx: &mut App) -> Task<anyhow::Result<()>>;
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum KernelStatus {
|
|
Idle,
|
|
Busy,
|
|
Starting,
|
|
Error,
|
|
ShuttingDown,
|
|
Shutdown,
|
|
Restarting,
|
|
}
|
|
|
|
impl KernelStatus {
|
|
pub fn is_connected(&self) -> bool {
|
|
match self {
|
|
KernelStatus::Idle | KernelStatus::Busy => true,
|
|
_ => false,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToString for KernelStatus {
|
|
fn to_string(&self) -> String {
|
|
match self {
|
|
KernelStatus::Idle => "Idle".to_string(),
|
|
KernelStatus::Busy => "Busy".to_string(),
|
|
KernelStatus::Starting => "Starting".to_string(),
|
|
KernelStatus::Error => "Error".to_string(),
|
|
KernelStatus::ShuttingDown => "Shutting Down".to_string(),
|
|
KernelStatus::Shutdown => "Shutdown".to_string(),
|
|
KernelStatus::Restarting => "Restarting".to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum Kernel {
|
|
RunningKernel(Box<dyn RunningKernel>),
|
|
StartingKernel(Shared<Task<()>>),
|
|
ErroredLaunch(String),
|
|
ShuttingDown,
|
|
Shutdown,
|
|
Restarting,
|
|
}
|
|
|
|
impl From<&Kernel> for KernelStatus {
|
|
fn from(kernel: &Kernel) -> Self {
|
|
match kernel {
|
|
Kernel::RunningKernel(kernel) => match kernel.execution_state() {
|
|
ExecutionState::Idle => KernelStatus::Idle,
|
|
ExecutionState::Busy => KernelStatus::Busy,
|
|
},
|
|
Kernel::StartingKernel(_) => KernelStatus::Starting,
|
|
Kernel::ErroredLaunch(_) => KernelStatus::Error,
|
|
Kernel::ShuttingDown => KernelStatus::ShuttingDown,
|
|
Kernel::Shutdown => KernelStatus::Shutdown,
|
|
Kernel::Restarting => KernelStatus::Restarting,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Kernel {
|
|
pub fn status(&self) -> KernelStatus {
|
|
self.into()
|
|
}
|
|
|
|
pub fn set_execution_state(&mut self, status: &ExecutionState) {
|
|
if let Kernel::RunningKernel(running_kernel) = self {
|
|
running_kernel.set_execution_state(status.clone());
|
|
}
|
|
}
|
|
|
|
pub fn set_kernel_info(&mut self, kernel_info: &KernelInfoReply) {
|
|
if let Kernel::RunningKernel(running_kernel) = self {
|
|
running_kernel.set_kernel_info(kernel_info.clone());
|
|
}
|
|
}
|
|
|
|
pub fn is_shutting_down(&self) -> bool {
|
|
match self {
|
|
Kernel::Restarting | Kernel::ShuttingDown => true,
|
|
Kernel::RunningKernel(_)
|
|
| Kernel::StartingKernel(_)
|
|
| Kernel::ErroredLaunch(_)
|
|
| Kernel::Shutdown => false,
|
|
}
|
|
}
|
|
}
|