
<img width="862" alt="image" src="https://github.com/user-attachments/assets/ae8c479d-d9f9-4c46-bb1a-be411ab07876"> Release Notes: - Added additional context about available to kernel sessions - Fixed bug in kernelspec launch choosing first available kernel matching the language rather than selected name --------- Co-authored-by: Jason <jason@zed.dev>
160 lines
4.7 KiB
Rust
160 lines
4.7 KiB
Rust
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use client::telemetry::Telemetry;
|
|
use collections::HashMap;
|
|
use command_palette_hooks::CommandPaletteFilter;
|
|
use gpui::{
|
|
prelude::*, AppContext, EntityId, Global, Model, ModelContext, Subscription, Task, View,
|
|
};
|
|
use project::Fs;
|
|
use settings::{Settings, SettingsStore};
|
|
|
|
use crate::kernels::kernel_specifications;
|
|
use crate::{JupyterSettings, KernelSpecification, Session};
|
|
|
|
struct GlobalReplStore(Model<ReplStore>);
|
|
|
|
impl Global for GlobalReplStore {}
|
|
|
|
pub struct ReplStore {
|
|
fs: Arc<dyn Fs>,
|
|
enabled: bool,
|
|
sessions: HashMap<EntityId, View<Session>>,
|
|
kernel_specifications: Vec<KernelSpecification>,
|
|
telemetry: Arc<Telemetry>,
|
|
_subscriptions: Vec<Subscription>,
|
|
}
|
|
|
|
impl ReplStore {
|
|
const NAMESPACE: &'static str = "repl";
|
|
|
|
pub(crate) fn init(fs: Arc<dyn Fs>, telemetry: Arc<Telemetry>, cx: &mut AppContext) {
|
|
let store = cx.new_model(move |cx| Self::new(fs, telemetry, cx));
|
|
|
|
store
|
|
.update(cx, |store, cx| store.refresh_kernelspecs(cx))
|
|
.detach_and_log_err(cx);
|
|
|
|
cx.set_global(GlobalReplStore(store))
|
|
}
|
|
|
|
pub fn global(cx: &AppContext) -> Model<Self> {
|
|
cx.global::<GlobalReplStore>().0.clone()
|
|
}
|
|
|
|
pub fn new(fs: Arc<dyn Fs>, telemetry: Arc<Telemetry>, cx: &mut ModelContext<Self>) -> Self {
|
|
let subscriptions = vec![cx.observe_global::<SettingsStore>(move |this, cx| {
|
|
this.set_enabled(JupyterSettings::enabled(cx), cx);
|
|
})];
|
|
|
|
let this = Self {
|
|
fs,
|
|
telemetry,
|
|
enabled: JupyterSettings::enabled(cx),
|
|
sessions: HashMap::default(),
|
|
kernel_specifications: Vec::new(),
|
|
_subscriptions: subscriptions,
|
|
};
|
|
this.on_enabled_changed(cx);
|
|
this
|
|
}
|
|
|
|
pub fn fs(&self) -> &Arc<dyn Fs> {
|
|
&self.fs
|
|
}
|
|
|
|
pub fn telemetry(&self) -> &Arc<Telemetry> {
|
|
&self.telemetry
|
|
}
|
|
|
|
pub fn is_enabled(&self) -> bool {
|
|
self.enabled
|
|
}
|
|
|
|
pub fn kernel_specifications(&self) -> impl Iterator<Item = &KernelSpecification> {
|
|
self.kernel_specifications.iter()
|
|
}
|
|
|
|
pub fn sessions(&self) -> impl Iterator<Item = &View<Session>> {
|
|
self.sessions.values()
|
|
}
|
|
|
|
fn set_enabled(&mut self, enabled: bool, cx: &mut ModelContext<Self>) {
|
|
if self.enabled == enabled {
|
|
return;
|
|
}
|
|
|
|
self.enabled = enabled;
|
|
self.on_enabled_changed(cx);
|
|
}
|
|
|
|
fn on_enabled_changed(&self, cx: &mut ModelContext<Self>) {
|
|
if !self.enabled {
|
|
CommandPaletteFilter::update_global(cx, |filter, _cx| {
|
|
filter.hide_namespace(Self::NAMESPACE);
|
|
});
|
|
|
|
return;
|
|
}
|
|
|
|
CommandPaletteFilter::update_global(cx, |filter, _cx| {
|
|
filter.show_namespace(Self::NAMESPACE);
|
|
});
|
|
|
|
cx.notify();
|
|
}
|
|
|
|
pub fn refresh_kernelspecs(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
|
|
let kernel_specifications = kernel_specifications(self.fs.clone());
|
|
cx.spawn(|this, mut cx| async move {
|
|
let kernel_specifications = kernel_specifications.await?;
|
|
|
|
this.update(&mut cx, |this, cx| {
|
|
this.kernel_specifications = kernel_specifications;
|
|
cx.notify();
|
|
})
|
|
})
|
|
}
|
|
|
|
pub fn kernelspec(&self, language_name: &str, cx: &AppContext) -> Option<KernelSpecification> {
|
|
let settings = JupyterSettings::get_global(cx);
|
|
let selected_kernel = settings.kernel_selections.get(language_name);
|
|
|
|
let found_by_name = self
|
|
.kernel_specifications
|
|
.iter()
|
|
.find(|runtime_specification| {
|
|
if let Some(selected) = selected_kernel {
|
|
// Top priority is the selected kernel
|
|
return runtime_specification.name.to_lowercase() == selected.to_lowercase();
|
|
}
|
|
return false;
|
|
})
|
|
.cloned();
|
|
|
|
if let Some(found_by_name) = found_by_name {
|
|
return Some(found_by_name);
|
|
}
|
|
|
|
self.kernel_specifications
|
|
.iter()
|
|
.find(|runtime_specification| {
|
|
runtime_specification.kernelspec.language.to_lowercase()
|
|
== language_name.to_lowercase()
|
|
})
|
|
.cloned()
|
|
}
|
|
|
|
pub fn get_session(&self, entity_id: EntityId) -> Option<&View<Session>> {
|
|
self.sessions.get(&entity_id)
|
|
}
|
|
|
|
pub fn insert_session(&mut self, entity_id: EntityId, session: View<Session>) {
|
|
self.sessions.insert(entity_id, session);
|
|
}
|
|
|
|
pub fn remove_session(&mut self, entity_id: EntityId) {
|
|
self.sessions.remove(&entity_id);
|
|
}
|
|
}
|