Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: init ai plugin on separate thread

Nathand29a90a472ac
diff --git a/frontend/appflowy_flutter/macos/Podfile.lock b/frontend/appflowy_flutter/macos/Podfile.lock
index 30ee626f09..b4a1a3d20d 100644
--- a/frontend/appflowy_flutter/macos/Podfile.lock
+++ b/frontend/appflowy_flutter/macos/Podfile.lock
@@ -144,34 +144,34 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
SPEC CHECKSUMS:
- app_links: 9028728e32c83a0831d9db8cf91c526d16cc5468
- appflowy_backend: 464aeb3e5c6966a41641a2111e5ead72ce2695f7
- auto_updater_macos: 3a42f1a06be6981f1a18be37e6e7bf86aa732118
- bitsdojo_window_macos: 7959fb0ca65a3ccda30095c181ecb856fae48ea9
- connectivity_plus: e74b9f74717d2d99d45751750e266e55912baeb5
- desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
- device_info_plus: a56e6e74dbbd2bb92f2da12c64ddd4f67a749041
- file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
- flowy_infra_ui: 8760ff42a789de40bf5007a5f176b454722a341e
+ app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
+ appflowy_backend: 865496343de667fc8c600e04b9fd05234e130cf9
+ auto_updater_macos: 3e3462c418fe4e731917eacd8d28eef7af84086d
+ bitsdojo_window_macos: 44e3b8fe3dd463820e0321f6256c5b1c16bb6a00
+ connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
+ desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
+ device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
+ file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
+ flowy_infra_ui: 03301a39ad118771adbf051a664265c61c507f38
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
- hotkey_manager: b443f35f4d772162937aa73fd8995e579f8ac4e2
- irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
- local_notifier: ebf072651e35ae5e47280ad52e2707375cb2ae4e
- package_info_plus: f0052d280d17aa382b932f399edf32507174e870
- path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+ hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023c
+ irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
+ local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
+ package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
+ path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
- screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
+ screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
- sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90
- share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
- shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+ sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
+ share_plus: 1fa619de8392a4398bfaf176d441853922614e89
+ shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
Sparkle: 5f8960a7a119aa7d45dacc0d5837017170bc5675
- sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
- super_native_extensions: c2795d6d9aedf4a79fae25cb6160b71b50549189
- url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
- webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c
- window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
+ sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+ super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
+ url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
+ webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
+ window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
PODFILE CHECKSUM: 0532f3f001ca3110b8be345d6491fff690e95823
diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rs
index 7850d8767b..be2b2c8bee 100644
--- a/frontend/rust-lib/flowy-ai/src/ai_manager.rs
+++ b/frontend/rust-lib/flowy-ai/src/ai_manager.rs
@@ -80,8 +80,8 @@ impl AIManager {
));
let cloned_local_ai = local_ai.clone();
- tokio::task::spawn_blocking(move || {
- futures::executor::block_on(cloned_local_ai.init_plugin_when_first_run());
+ tokio::spawn(async move {
+ cloned_local_ai.observe_plugin_resource().await;
});
let external_service = Arc::new(query_service);
@@ -103,7 +103,7 @@ impl AIManager {
}
pub async fn initialize(&self, _workspace_id: &str) -> Result<(), FlowyError> {
- let _ = self.local_ai.reload().await;
+ self.local_ai.reload().await?;
Ok(())
}
diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
index c44b62be01..493b744152 100644
--- a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
+++ b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
@@ -122,7 +122,7 @@ impl LocalAIController {
}
#[instrument(level = "debug", skip_all)]
- pub async fn init_plugin_when_first_run(&self) {
+ pub async fn observe_plugin_resource(&self) {
debug!(
"[AI Plugin] init plugin when first run. thread: {:?}",
std::thread::current().id()
@@ -160,26 +160,15 @@ impl LocalAIController {
}
}
});
-
- // Perform initial initialization if required.
- if self.should_init_plugin().await {
- try_init_plugin(&self.resource, &self.ai_plugin).await;
- } else {
- trace!("[AI Plugin] local ai is able to start");
- }
}
pub async fn reload(&self) -> FlowyResult<()> {
let is_enabled = self.is_enabled();
+
self.toggle_plugin(is_enabled).await?;
Ok(())
}
- /// Returns true if the local AI is enabled and ready to use.
- pub async fn should_init_plugin(&self) -> bool {
- self.is_enabled() && self.resource.is_resource_ready().await
- }
-
/// Indicate whether the local AI plugin is running.
pub fn is_running(&self) -> bool {
if !self.is_enabled() {
@@ -255,17 +244,24 @@ impl LocalAIController {
setting,
std::thread::current().id()
);
- self.destroy_chat_plugin().await?;
self.resource.set_llm_setting(setting).await?;
self.reload().await?;
Ok(())
}
+ #[instrument(level = "debug", skip_all)]
pub async fn get_local_ai_state(&self) -> LocalAIPB {
+ let start = std::time::Instant::now();
let enabled = self.is_enabled();
let is_app_downloaded = self.resource.is_app_downloaded();
let state = self.ai_plugin.get_plugin_running_state();
let lack_of_resource = self.resource.get_lack_of_resource().await;
+ let elapsed = start.elapsed();
+ debug!(
+ "[AI Plugin] get local ai state, elapsed: {:?}, thread: {:?}",
+ elapsed,
+ std::thread::current().id()
+ );
LocalAIPB {
enabled,
is_app_downloaded,
@@ -441,11 +437,15 @@ impl LocalAIController {
#[instrument(level = "debug", skip_all, err)]
async fn initialize_ai_plugin(
- llm_chat: &Arc<OllamaAIPlugin>,
+ plugin: &Arc<OllamaAIPlugin>,
llm_resource: &Arc<LocalAIResourceController>,
ret: Option<tokio::sync::oneshot::Sender<()>>,
) -> FlowyResult<()> {
- let llm_chat = llm_chat.clone();
+ let plugin = plugin.clone();
+ if plugin.get_plugin_running_state().is_loading() {
+ return Ok(());
+ }
+
let lack_of_resource = llm_resource.get_lack_of_resource().await;
chat_notification_builder(
APPFLOWY_AI_NOTIFICATION_KEY,
@@ -488,7 +488,7 @@ async fn initialize_ai_plugin(
std::thread::current().id()
);
- match llm_chat.init_chat_plugin(config).await {
+ match plugin.init_chat_plugin(config).await {
Ok(_) => {},
Err(err) => error!("[AI Plugin] failed to setup plugin: {:?}", err),
}
diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs b/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs
index d18e045cbe..11063e43d6 100644
--- a/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs
+++ b/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs
@@ -87,19 +87,18 @@ pub(crate) fn ollama_plugin_path() -> std::path::PathBuf {
// Use LOCALAPPDATA for a user-specific installation path on Windows.
let local_appdata =
std::env::var("LOCALAPPDATA").unwrap_or_else(|_| "C:\\Program Files".to_string());
- return std::path::PathBuf::from(local_appdata)
- .join("Programs\\appflowy_plugin\\ollama_ai_plugin.exe");
+ std::path::PathBuf::from(local_appdata).join("Programs\\appflowy_plugin\\ollama_ai_plugin.exe")
}
#[cfg(target_os = "macos")]
{
let offline_app = "ollama_ai_plugin";
- return std::path::PathBuf::from(format!("/usr/local/bin/{}", offline_app));
+ std::path::PathBuf::from(format!("/usr/local/bin/{}", offline_app))
}
#[cfg(target_os = "linux")]
{
let offline_app = "ollama_ai_plugin";
- return std::path::PathBuf::from(format!("/usr/local/bin/{}", offline_app));
+ std::path::PathBuf::from(format!("/usr/local/bin/{}", offline_app))
}
}
diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rs
index 4c84e73c08..2c41c1f205 100644
--- a/frontend/rust-lib/flowy-core/src/lib.rs
+++ b/frontend/rust-lib/flowy-core/src/lib.rs
@@ -255,6 +255,7 @@ impl AppFlowyCore {
server_provider: server_provider.clone(),
storage_manager: storage_manager.clone(),
ai_manager: ai_manager.clone(),
+ runtime: runtime.clone(),
};
let collab_interact_impl = CollabInteractImpl {
diff --git a/frontend/rust-lib/flowy-core/src/user_state_callback.rs b/frontend/rust-lib/flowy-core/src/user_state_callback.rs
index a43c28f90b..5a6a2e7b2a 100644
--- a/frontend/rust-lib/flowy-core/src/user_state_callback.rs
+++ b/frontend/rust-lib/flowy-core/src/user_state_callback.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
use anyhow::Context;
use client_api::entity::billing_dto::SubscriptionPlan;
-use tracing::{event, info};
+use tracing::{error, event, info};
use collab_entity::CollabType;
use collab_integrate::collab_builder::AppFlowyCollabBuilder;
@@ -15,6 +15,7 @@ use flowy_storage::manager::StorageManager;
use flowy_user::event_map::UserStatusCallback;
use flowy_user_pub::cloud::{UserCloudConfig, UserCloudServiceProvider};
use flowy_user_pub::entities::{Authenticator, UserProfile, UserWorkspace};
+use lib_dispatch::runtime::AFPluginRuntime;
use lib_infra::async_trait::async_trait;
use crate::server_layer::{Server, ServerProvider};
@@ -27,6 +28,20 @@ pub(crate) struct UserStatusCallbackImpl {
pub(crate) server_provider: Arc<ServerProvider>,
pub(crate) storage_manager: Arc<StorageManager>,
pub(crate) ai_manager: Arc<AIManager>,
+ // By default, all callback will run on the caller thread. If you don't want to block the caller
+ // thread, you can use runtime to spawn a new task.
+ pub(crate) runtime: Arc<AFPluginRuntime>,
+}
+
+impl UserStatusCallbackImpl {
+ fn init_ai_component(&self, workspace_id: String) {
+ let cloned_ai_manager = self.ai_manager.clone();
+ self.runtime.spawn(async move {
+ if let Err(err) = cloned_ai_manager.initialize(&workspace_id).await {
+ error!("Failed to initialize AIManager: {:?}", err);
+ }
+ });
+ }
}
#[async_trait]
@@ -70,7 +85,9 @@ impl UserStatusCallback for UserStatusCallbackImpl {
.initialize(user_id, authenticator == &Authenticator::Local)
.await?;
self.document_manager.initialize(user_id).await?;
- self.ai_manager.initialize(&user_workspace.id).await?;
+
+ let workspace_id = user_workspace.id.clone();
+ self.init_ai_component(workspace_id);
Ok(())
}
@@ -97,6 +114,9 @@ impl UserStatusCallback for UserStatusCallbackImpl {
.initialize(user_id, authenticator.is_local())
.await?;
self.document_manager.initialize(user_id).await?;
+
+ let workspace_id = user_workspace.id.clone();
+ self.init_ai_component(workspace_id);
Ok(())
}
@@ -175,6 +195,9 @@ impl UserStatusCallback for UserStatusCallbackImpl {
.initialize_with_new_user(user_profile.uid)
.await
.context("DocumentManager error")?;
+
+ let workspace_id = user_workspace.id.clone();
+ self.init_ai_component(workspace_id);
Ok(())
}