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: notify model change after applying local ai model

Nathan120f22c6fc98
diff --git a/frontend/appflowy_flutter/lib/flutter/af_dropdown_menu.dart b/frontend/appflowy_flutter/lib/flutter/af_dropdown_menu.dart
index 56a61e120b..157be012b1 100644
--- a/frontend/appflowy_flutter/lib/flutter/af_dropdown_menu.dart
+++ b/frontend/appflowy_flutter/lib/flutter/af_dropdown_menu.dart
@@ -16,6 +16,8 @@ const double _kMinimumWidth = 112.0;
const double _kDefaultHorizontalPadding = 12.0;
+typedef CompareFunction<T> = bool Function(T? left, T? right);
+
// Navigation shortcuts to move the selected menu items up or down.
final Map<ShortcutActivator, Intent> _kMenuTraversalShortcuts =
<ShortcutActivator, Intent>{
@@ -86,6 +88,7 @@ class AFDropdownMenu<T> extends StatefulWidget {
this.requestFocusOnTap,
this.expandedInsets,
this.searchCallback,
+ this.selectOptionCompare,
required this.dropdownMenuEntries,
});
@@ -267,6 +270,11 @@ class AFDropdownMenu<T> extends StatefulWidget {
/// which contains the contents of the text input field.
final SearchCallback<T>? searchCallback;
+ /// Defines the compare function for the menu items.
+ ///
+ /// Defaults to null. If this is null, the menu items will be sorted by the label.
+ final CompareFunction<T>? selectOptionCompare;
+
@override
State<AFDropdownMenu<T>> createState() => _AFDropdownMenuState<T>();
}
@@ -301,7 +309,16 @@ class _AFDropdownMenuState<T> extends State<AFDropdownMenu<T>> {
filteredEntries.any((DropdownMenuEntry<T> entry) => entry.enabled);
final int index = filteredEntries.indexWhere(
- (DropdownMenuEntry<T> entry) => entry.value == widget.initialSelection,
+ (DropdownMenuEntry<T> entry) {
+ if (widget.selectOptionCompare != null) {
+ return widget.selectOptionCompare!(
+ entry.value,
+ widget.initialSelection,
+ );
+ } else {
+ return entry.value == widget.initialSelection;
+ }
+ },
);
if (index != -1) {
_textEditingController.value = TextEditingValue(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart
index 30ff4addde..7357c2951c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart
@@ -21,7 +21,6 @@ class AIModelSelection extends StatelessWidget {
previous.availableModels != current.availableModels,
builder: (context, state) {
final models = state.availableModels?.models;
-
if (models == null) {
return const SizedBox(
// Using same height as SettingsDropdown to avoid layout shift
@@ -31,6 +30,7 @@ class AIModelSelection extends StatelessWidget {
final localModels = models.where((model) => model.isLocal).toList();
final cloudModels = models.where((model) => !model.isLocal).toList();
+ final selectedModel = state.availableModels!.selectedModel;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
@@ -48,7 +48,9 @@ class AIModelSelection extends StatelessWidget {
onChanged: (model) => context
.read<SettingsAIBloc>()
.add(SettingsAIEvent.selectModel(model)),
- selectedOption: state.availableModels!.selectedModel,
+ selectedOption: selectedModel,
+ selectOptionCompare: (left, right) =>
+ left?.name == right?.name,
options: [...localModels, ...cloudModels]
.map(
(model) => buildDropdownMenuEntry<AIModelPB>(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
index 3b2e883210..e392ed91f0 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
@@ -16,9 +16,11 @@ class SettingsDropdown<T> extends StatefulWidget {
this.onChanged,
this.actions,
this.expandWidth = true,
+ this.selectOptionCompare,
});
final T selectedOption;
+ final CompareFunction<T>? selectOptionCompare;
final List<DropdownMenuEntry<T>> options;
final void Function(T)? onChanged;
final List<Widget>? actions;
@@ -52,6 +54,7 @@ class _SettingsDropdownState<T> extends State<SettingsDropdown<T>> {
expandedInsets: widget.expandWidth ? EdgeInsets.zero : null,
initialSelection: widget.selectedOption,
dropdownMenuEntries: widget.options,
+ selectOptionCompare: widget.selectOptionCompare,
textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontFamily: fontFamilyUsed,
fontWeight: FontWeight.w400,
diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rs
index 1aac5b0109..5e50f768f1 100644
--- a/frontend/rust-lib/flowy-ai/src/ai_manager.rs
+++ b/frontend/rust-lib/flowy-ai/src/ai_manager.rs
@@ -3,7 +3,7 @@ use crate::entities::{
AIModelPB, AvailableModelsPB, ChatInfoPB, ChatMessageListPB, ChatMessagePB, ChatSettingsPB,
FilePB, PredefinedFormatPB, RepeatedRelatedQuestionPB, StreamMessageParams,
};
-use crate::local_ai::controller::LocalAIController;
+use crate::local_ai::controller::{LocalAIController, LocalAISetting};
use crate::middleware::chat_service_mw::AICloudServiceMiddleware;
use crate::persistence::{insert_chat, read_chat_metadata, ChatTable};
use std::collections::HashMap;
@@ -280,6 +280,24 @@ impl AIManager {
Ok(())
}
+ pub async fn update_local_ai_setting(&self, setting: LocalAISetting) -> FlowyResult<()> {
+ let previous_model = self.local_ai.get_local_ai_setting().chat_model_name;
+ self.local_ai.update_local_ai_setting(setting).await?;
+ let current_model = self.local_ai.get_local_ai_setting().chat_model_name;
+
+ if previous_model != current_model {
+ info!(
+ "[AI Plugin] update global active model, previous: {}, current: {}",
+ previous_model, current_model
+ );
+ let source_key = ai_available_models_key(GLOBAL_ACTIVE_MODEL_KEY);
+ let model = AIModel::local(current_model, "".to_string());
+ self.update_selected_model(source_key, model).await?;
+ }
+
+ Ok(())
+ }
+
async fn get_workspace_select_model(&self) -> FlowyResult<String> {
let workspace_id = self.user_service.workspace_id()?;
let model = self
@@ -358,6 +376,10 @@ impl AIManager {
}
pub async fn update_selected_model(&self, source: String, model: AIModel) -> FlowyResult<()> {
+ info!(
+ "[Model Selection] update {} selected model: {:?}",
+ source, model
+ );
let source_key = ai_available_models_key(&source);
self
.store_preferences
@@ -418,9 +440,15 @@ impl AIManager {
trace!("[Model Selection]: Available models: {:?}", models);
+ let mut current_active_local_ai_model = None;
+
// If user enable local ai, then add local ai model to the list.
if let Some(local_model) = self.local_ai.get_plugin_chat_model() {
- models.push(AIModel::local(local_model, "".to_string()));
+ let model = AIModel::local(local_model, "".to_string());
+ current_active_local_ai_model = Some(model.clone());
+
+ trace!("[Model Selection] current local ai model: {}", model.name);
+ models.push(model);
}
if models.is_empty() {
@@ -454,8 +482,16 @@ impl AIManager {
user_selected_model = local_ai_model.clone();
}
},
- Some(model) => {
- trace!("[Model Selection] user select model: {:?}", model);
+ Some(mut model) => {
+ trace!("[Model Selection] user previous select model: {:?}", model);
+ if model.is_local {
+ if let Some(local_ai_model) = &current_active_local_ai_model {
+ if local_ai_model.name != model.name {
+ model = local_ai_model.clone();
+ }
+ }
+ }
+
user_selected_model = model;
},
}
diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rs
index 4a36a5d37a..72a271f5a1 100644
--- a/frontend/rust-lib/flowy-ai/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-ai/src/event_handler.rs
@@ -369,9 +369,6 @@ pub(crate) async fn update_local_ai_setting_handler(
) -> Result<(), FlowyError> {
let data = data.try_into_inner()?;
let ai_manager = upgrade_ai_manager(ai_manager)?;
- ai_manager
- .local_ai
- .update_local_ai_setting(data.into())
- .await?;
+ ai_manager.update_local_ai_setting(data.into()).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 b63401b829..1a125a4b47 100644
--- a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
+++ b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
@@ -292,8 +292,10 @@ impl LocalAIController {
setting,
std::thread::current().id()
);
- self.resource.set_llm_setting(setting).await?;
- self.reload().await?;
+
+ if let Ok(_) = self.resource.set_llm_setting(setting).await {
+ self.reload().await?;
+ }
Ok(())
}
diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/resource.rs b/frontend/rust-lib/flowy-ai/src/local_ai/resource.rs
index c40a9a9b88..b384b30f4a 100644
--- a/frontend/rust-lib/flowy-ai/src/local_ai/resource.rs
+++ b/frontend/rust-lib/flowy-ai/src/local_ai/resource.rs
@@ -139,12 +139,14 @@ impl LocalAIResourceController {
pub async fn set_llm_setting(&self, setting: LocalAISetting) -> FlowyResult<()> {
self.resource_service.store_setting(setting)?;
if let Some(resource) = self.calculate_pending_resources().await? {
+ let resource = LackOfAIResourcePB::from(resource);
chat_notification_builder(
APPFLOWY_AI_NOTIFICATION_KEY,
ChatNotification::LocalAIResourceUpdated,
)
- .payload(LackOfAIResourcePB::from(resource))
+ .payload(resource.clone())
.send();
+ return Err(FlowyError::local_ai().with_context(format!("{:?}", resource)));
}
Ok(())
}