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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: rename
Nathan3bc0cc7b43db
diff --git a/frontend/appflowy_flutter/lib/ai/service/ai_model_state_notifier.dart b/frontend/appflowy_flutter/lib/ai/service/ai_model_state_notifier.dartindex c360356240..783046a3d0 100644--- a/frontend/appflowy_flutter/lib/ai/service/ai_model_state_notifier.dart+++ b/frontend/appflowy_flutter/lib/ai/service/ai_model_state_notifier.dart@@ -53,7 +53,7 @@ class AIModelStateNotifier {final LocalAIStateListener? _localAIListener;final AIModelSwitchListener _aiModelSwitchListener;LocalAIPB? _localAIState;- AvailableModelsPB? _availableModels;+ ModelSelectionPB? _sourceModelSelection;// callbacksfinal List<OnModelStateChangedCallback> _stateChangedCallbacks = [];@@ -69,7 +69,7 @@ class AIModelStateNotifier {if (state.state == RunningStatePB.Running ||state.state == RunningStatePB.Stopped) {- await _loadAvailableModels();+ await _loadModelSelection();_notifyAvailableModelsChanged();}},@@ -78,11 +78,11 @@ class AIModelStateNotifier {_aiModelSwitchListener.start(onUpdateSelectedModel: (model) async {- final updatedModels = _availableModels?.deepCopy()- ?..globalModel = model;- _availableModels = updatedModels;- _notifyAvailableModelsChanged();+ final updatedModels = _sourceModelSelection?.deepCopy()+ ?..selectedModel = model;+ _sourceModelSelection = updatedModels;+ _notifyAvailableModelsChanged();if (model.isLocal && UniversalPlatform.isDesktop) {await _loadLocalAiState();}@@ -92,7 +92,7 @@ class AIModelStateNotifier {}void _init() async {- await Future.wait([_loadLocalAiState(), _loadAvailableModels()]);+ await Future.wait([_loadLocalAiState(), _loadModelSelection()]);_notifyStateChanged();_notifyAvailableModelsChanged();}@@ -139,7 +139,7 @@ class AIModelStateNotifier {);}- final availableModels = _availableModels;+ final availableModels = _sourceModelSelection;final localAiState = _localAIState;if (availableModels == null) {@@ -161,7 +161,7 @@ class AIModelStateNotifier {);}- if (!availableModels.globalModel.isLocal) {+ if (!availableModels.selectedModel.isLocal) {return AIModelState(type: AiType.cloud,hintText: LocaleKeys.chat_inputMessageHint.tr(),@@ -194,16 +194,16 @@ class AIModelStateNotifier {);}- (List<AIModelPB>, AIModelPB?) getAvailableModels() {- final availableModels = _availableModels;+ (List<AIModelPB>, AIModelPB?) getModelSelection() {+ final availableModels = _sourceModelSelection;if (availableModels == null) {return ([], null);}- return (availableModels.models, availableModels.globalModel);+ return (availableModels.models, availableModels.selectedModel);}void _notifyAvailableModelsChanged() {- final (models, selectedModel) = getAvailableModels();+ final (models, selectedModel) = getModelSelection();for (final callback in _availableModelsChangedCallbacks) {callback(models, selectedModel);}@@ -216,10 +216,10 @@ class AIModelStateNotifier {}}- Future<void> _loadAvailableModels() {- final payload = AvailableModelsQueryPB(source: objectId);- return AIEventGetAvailableModels(payload).send().fold(- (models) => _availableModels = models,+ Future<void> _loadModelSelection() {+ final payload = ModelSourcePB(source: objectId);+ return AIEventGetSourceModelSelection(payload).send().fold(+ (models) => _sourceModelSelection = models,(err) => Log.error("Failed to get available models: $err"),);}diff --git a/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart b/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dartindex 7ad52b9ec4..4044227fb1 100644--- a/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart+++ b/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart@@ -83,7 +83,7 @@ class SelectModelState with _$SelectModelState {}) = _SelectModelState;factory SelectModelState.initial(AIModelStateNotifier notifier) {- final (models, selectedModel) = notifier.getAvailableModels();+ final (models, selectedModel) = notifier.getModelSelection();return SelectModelState(models: models,selectedModel: selectedModel,diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/ai/ai_settings_group.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/ai/ai_settings_group.dartindex 6bed7ed035..fe0e0a7160 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/setting/ai/ai_settings_group.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/setting/ai/ai_settings_group.dart@@ -36,7 +36,7 @@ class AiSettingsGroup extends StatelessWidget {MobileSettingItem(name: LocaleKeys.settings_aiPage_keys_llmModelType.tr(),trailing: MobileSettingTrailing(- text: state.availableModels?.globalModel.name ?? "",+ text: state.availableModels?.selectedModel.name ?? "",),onTap: () => _onLLMModelTypeTap(context, state),),@@ -73,7 +73,7 @@ class AiSettingsGroup extends StatelessWidget {text: entry.value.name,showTopBorder: entry.key == 0,isSelected:- availableModels?.globalModel.name == entry.value.name,+ availableModels?.selectedModel.name == entry.value.name,onTap: () {context.read<SettingsAIBloc>()diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dartindex 738e8c9574..cab3d486cf 100644--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart@@ -448,7 +448,7 @@ class _ChangeModelButtonState extends State<ChangeModelButton> {child: buildButton(context),popupBuilder: (_) {final bloc = context.read<AIPromptInputBloc>();- final (models, _) = bloc.aiModelStateNotifier.getAvailableModels();+ final (models, _) = bloc.aiModelStateNotifier.getModelSelection();return SelectModelPopoverContent(models: models,selectedModel: null,diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dartindex 85796cae65..03f0d61ebc 100644--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart@@ -407,7 +407,7 @@ class ChatAIMessagePopup extends StatelessWidget {return MobileQuickActionButton(onTap: () async {final bloc = context.read<AIPromptInputBloc>();- final (models, _) = bloc.aiModelStateNotifier.getAvailableModels();+ final (models, _) = bloc.aiModelStateNotifier.getModelSelection();final result = await showChangeModelBottomSheet(context, models);if (result != null) {onChangeModel?.call(result);diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/ollama_setting_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/ollama_setting_bloc.dartindex 3b9060bb08..2a058c6f37 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/ollama_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/ollama_setting_bloc.dart@@ -32,11 +32,11 @@ class OllamaSettingBloc extends Bloc<OllamaSettingEvent, OllamaSettingState> {) async {try {final results = await Future.wait([- AIEventGetLocalAIModels().send().then((r) => r.getOrThrow()),+ AIEventGetLocalModelSelection().send().then((r) => r.getOrThrow()),AIEventGetLocalAISetting().send().then((r) => r.getOrThrow()),]);- final models = results[0] as AvailableModelsPB;+ final models = results[0] as ModelSelectionPB;final setting = results[1] as LocalAISettingPB;if (!isClosed) {@@ -189,7 +189,7 @@ class SubmittedItem extends Equatable {class OllamaSettingEvent with _$OllamaSettingEvent {const factory OllamaSettingEvent.started() = _Started;const factory OllamaSettingEvent.didLoadLocalModels(- AvailableModelsPB models,+ ModelSelectionPB models,) = _DidLoadLocalModels;const factory OllamaSettingEvent.didLoadSetting(LocalAISettingPB setting,@@ -213,7 +213,7 @@ class OllamaSettingState with _$OllamaSettingState {LocalAISettingPB? setting,@Default([]) List<SettingItem> inputItems,AIModelPB? selectedModel,- AvailableModelsPB? localModels,+ ModelSelectionPB? localModels,AIModelPB? defaultModel,@Default([]) List<SubmittedItem> submittedItems,@Default(false) bool isEdited,diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dartindex 0141283765..9409494b57 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart@@ -93,7 +93,7 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {),);},- didLoadAvailableModels: (AvailableModelsPB models) {+ didLoadAvailableModels: (ModelSelectionPB models) {emit(state.copyWith(availableModels: models,@@ -134,7 +134,8 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {);void _loadModelList() {- AIEventGetServerAvailableModels().send().then((result) {+ final payload = ModelSourcePB(source: aiModelsGlobalActiveModel);+ AIEventGetSettingModelSelection(payload).send().then((result) {result.fold((models) {if (!isClosed) {add(SettingsAIEvent.didLoadAvailableModels(models));@@ -175,7 +176,7 @@ class SettingsAIEvent with _$SettingsAIEvent {) = _DidReceiveUserProfile;const factory SettingsAIEvent.didLoadAvailableModels(- AvailableModelsPB models,+ ModelSelectionPB models,) = _DidLoadAvailableModels;}@@ -184,7 +185,7 @@ class SettingsAIState with _$SettingsAIState {const factory SettingsAIState({required UserProfilePB userProfile,WorkspaceSettingsPB? aiSettings,- AvailableModelsPB? availableModels,+ ModelSelectionPB? availableModels,@Default(true) bool enableSearchIndexing,}) = _SettingsAIState;}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.dartindex 83f4ff603e..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@@ -30,7 +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!.globalModel;+ final selectedModel = state.availableModels!.selectedModel;return Padding(padding: const EdgeInsets.symmetric(vertical: 6),diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollama_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollama_setting.dartindex fc56fc61e7..10e804e65e 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollama_setting.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollama_setting.dart@@ -157,7 +157,7 @@ class LocalAIModelSelection extends StatelessWidget {onChanged: (model) => context.read<OllamaSettingBloc>().add(OllamaSettingEvent.setDefaultModel(model)),- selectedOption: models.globalModel,+ selectedOption: models.selectedModel,selectOptionCompare: (left, right) => left?.name == right?.name,options: models.models.map(diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rsindex c21ccef080..eceab53ad9 100644--- a/frontend/rust-lib/flowy-ai/src/ai_manager.rs+++ b/frontend/rust-lib/flowy-ai/src/ai_manager.rs@@ -1,7 +1,7 @@use crate::chat::Chat;use crate::entities::{- AIModelPB, AvailableModelsPB, ChatInfoPB, ChatMessageListPB, ChatMessagePB, ChatSettingsPB,- FilePB, PredefinedFormatPB, RepeatedRelatedQuestionPB, StreamMessageParams,+ AIModelPB, ChatInfoPB, ChatMessageListPB, ChatMessagePB, ChatSettingsPB, FilePB,+ ModelSelectionPB, PredefinedFormatPB, RepeatedRelatedQuestionPB, StreamMessageParams,};use crate::local_ai::controller::{LocalAIController, LocalAISetting};use crate::middleware::chat_service_mw::ChatServiceMiddleware;@@ -514,7 +514,7 @@ impl AIManager {}}- pub async fn get_local_available_models(&self) -> FlowyResult<AvailableModelsPB> {+ pub async fn get_local_available_models(&self) -> FlowyResult<ModelSelectionPB> {let setting = self.local_ai.get_local_ai_setting();let mut models = self.local_ai.get_all_chat_local_models().await;let selected_model = AIModel::local(setting.chat_model_name, "".to_string());@@ -523,13 +523,17 @@ impl AIManager {models.push(selected_model.clone());}- Ok(AvailableModelsPB {+ Ok(ModelSelectionPB {models: models.into_iter().map(AIModelPB::from).collect(),- global_model: AIModelPB::from(selected_model),+ selected_model: AIModelPB::from(selected_model),})}- pub async fn get_available_models(&self, source: String) -> FlowyResult<AvailableModelsPB> {+ pub async fn get_available_models(+ &self,+ source: String,+ setting_only: bool,+ ) -> FlowyResult<ModelSelectionPB> {let is_local_mode = self.user_service.is_local_model().await?;if is_local_mode {return self.get_local_available_models().await;@@ -547,15 +551,19 @@ impl AIManager {// Add local models if enabledif self.local_ai.is_enabled() {- let setting = self.local_ai.get_local_ai_setting();- all_models.push(AIModel::local(setting.chat_model_name, "".to_string()).into());+ if setting_only {+ let setting = self.local_ai.get_local_ai_setting();+ all_models.push(AIModel::local(setting.chat_model_name, "".to_string()).into());+ } else {+ all_models.extend(self.local_ai.get_all_chat_local_models().await);+ }}// Return early if no models availableif all_models.is_empty() {- return Ok(AvailableModelsPB {+ return Ok(ModelSelectionPB {models: Vec::new(),- global_model: AIModelPB::default(),+ selected_model: AIModelPB::default(),});}@@ -617,9 +625,9 @@ impl AIManager {trace!("[Model Selection] final active model: {:?}", active_model);// Create response with one transformation pass- Ok(AvailableModelsPB {+ Ok(ModelSelectionPB {models: all_models.into_iter().map(AIModelPB::from).collect(),- global_model: AIModelPB::from(active_model),+ selected_model: AIModelPB::from(active_model),})}diff --git a/frontend/rust-lib/flowy-ai/src/entities.rs b/frontend/rust-lib/flowy-ai/src/entities.rsindex 5e03fadf56..9ffa2acf33 100644--- a/frontend/rust-lib/flowy-ai/src/entities.rs+++ b/frontend/rust-lib/flowy-ai/src/entities.rs@@ -182,7 +182,7 @@ pub struct ChatMessageListPB {}#[derive(Default, ProtoBuf, Clone, Debug)]-pub struct ServerAvailableModelsPB {+pub struct ServerModelSelectionPB {#[pb(index = 1)]pub models: Vec<AvailableModelPB>,}@@ -200,7 +200,7 @@ pub struct AvailableModelPB {}#[derive(Default, ProtoBuf, Validate, Clone, Debug)]-pub struct AvailableModelsQueryPB {+pub struct ModelSourcePB {#[pb(index = 1)]#[validate(custom(function = "required_not_empty_str"))]pub source: String,@@ -217,12 +217,12 @@ pub struct UpdateSelectedModelPB {}#[derive(Default, ProtoBuf, Clone, Debug)]-pub struct AvailableModelsPB {+pub struct ModelSelectionPB {#[pb(index = 1)]pub models: Vec<AIModelPB>,#[pb(index = 2)]- pub global_model: AIModelPB,+ pub selected_model: AIModelPB,}#[derive(Default, ProtoBuf, Clone, Debug)]diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rsindex 160fbe6928..fd7bab3298 100644--- a/frontend/rust-lib/flowy-ai/src/event_handler.rs+++ b/frontend/rust-lib/flowy-ai/src/event_handler.rs@@ -1,4 +1,4 @@-use crate::ai_manager::{AIManager, GLOBAL_ACTIVE_MODEL_KEY};+use crate::ai_manager::AIManager;use crate::completion::AICompletion;use crate::entities::*;use flowy_ai_pub::cloud::{AIModel, ChatMessageType};@@ -77,24 +77,24 @@ pub(crate) async fn regenerate_response_handler(}#[tracing::instrument(level = "debug", skip_all, err)]-pub(crate) async fn get_server_model_list_handler(+pub(crate) async fn get_setting_model_selection_handler(+ data: AFPluginData<ModelSourcePB>,ai_manager: AFPluginState<Weak<AIManager>>,-) -> DataResult<AvailableModelsPB, FlowyError> {+) -> DataResult<ModelSelectionPB, FlowyError> {+ let data = data.try_into_inner()?;let ai_manager = upgrade_ai_manager(ai_manager)?;- let models = ai_manager- .get_available_models(GLOBAL_ACTIVE_MODEL_KEY.to_string())- .await?;+ let models = ai_manager.get_available_models(data.source, true).await?;data_result_ok(models)}#[tracing::instrument(level = "debug", skip_all, err)]-pub(crate) async fn get_chat_models_handler(- data: AFPluginData<AvailableModelsQueryPB>,+pub(crate) async fn get_source_model_selection_handler(+ data: AFPluginData<ModelSourcePB>,ai_manager: AFPluginState<Weak<AIManager>>,-) -> DataResult<AvailableModelsPB, FlowyError> {+) -> DataResult<ModelSelectionPB, FlowyError> {let data = data.try_into_inner()?;let ai_manager = upgrade_ai_manager(ai_manager)?;- let models = ai_manager.get_available_models(data.source).await?;+ let models = ai_manager.get_available_models(data.source, false).await?;data_result_ok(models)}@@ -343,7 +343,7 @@ pub(crate) async fn get_local_ai_setting_handler(#[tracing::instrument(level = "debug", skip_all)]pub(crate) async fn get_local_ai_models_handler(ai_manager: AFPluginState<Weak<AIManager>>,-) -> DataResult<AvailableModelsPB, FlowyError> {+) -> DataResult<ModelSelectionPB, FlowyError> {let ai_manager = upgrade_ai_manager(ai_manager)?;let data = ai_manager.get_local_available_models().await?;data_result_ok(data)diff --git a/frontend/rust-lib/flowy-ai/src/event_map.rs b/frontend/rust-lib/flowy-ai/src/event_map.rsindex ee77f454a5..df0721b361 100644--- a/frontend/rust-lib/flowy-ai/src/event_map.rs+++ b/frontend/rust-lib/flowy-ai/src/event_map.rs@@ -31,21 +31,24 @@ pub fn init(ai_manager: Weak<AIManager>) -> AFPlugin {.event(AIEvent::ToggleLocalAI, toggle_local_ai_handler).event(AIEvent::GetLocalAIState, get_local_ai_state_handler).event(AIEvent::GetLocalAISetting, get_local_ai_setting_handler)- .event(AIEvent::GetLocalAIModels, get_local_ai_models_handler)+ .event(AIEvent::GetLocalModelSelection, get_local_ai_models_handler).event(- AIEvent::UpdateLocalAISetting,- update_local_ai_setting_handler,+ AIEvent::GetSourceModelSelection,+ get_source_model_selection_handler,).event(- AIEvent::GetServerAvailableModels,- get_server_model_list_handler,+ AIEvent::UpdateLocalAISetting,+ update_local_ai_setting_handler,).event(AIEvent::CreateChatContext, create_chat_context_handler).event(AIEvent::GetChatInfo, create_chat_context_handler).event(AIEvent::GetChatSettings, get_chat_settings_handler).event(AIEvent::UpdateChatSettings, update_chat_settings_handler).event(AIEvent::RegenerateResponse, regenerate_response_handler)- .event(AIEvent::GetAvailableModels, get_chat_models_handler)+ .event(+ AIEvent::GetSettingModelSelection,+ get_setting_model_selection_handler,+ ).event(AIEvent::UpdateSelectedModel, update_selected_model_handler)}@@ -108,21 +111,21 @@ pub enum AIEvent {#[event(input = "RegenerateResponsePB")]RegenerateResponse = 27,- #[event(output = "AvailableModelsPB")]- GetServerAvailableModels = 28,-#[event(output = "LocalAISettingPB")]GetLocalAISetting = 29,#[event(input = "LocalAISettingPB")]UpdateLocalAISetting = 30,- #[event(input = "AvailableModelsQueryPB", output = "AvailableModelsPB")]- GetAvailableModels = 31,+ #[event(input = "ModelSourcePB", output = "ModelSelectionPB")]+ GetSettingModelSelection = 31,#[event(input = "UpdateSelectedModelPB")]UpdateSelectedModel = 32,- #[event(output = "AvailableModelsPB")]- GetLocalAIModels = 33,+ #[event(output = "ModelSelectionPB")]+ GetLocalModelSelection = 33,++ #[event(input = "ModelSourcePB", output = "ModelSelectionPB")]+ GetSourceModelSelection = 34,}diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rsindex bf7f431682..1271589da6 100644--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs@@ -140,17 +140,17 @@ diesel::table! {}diesel::allow_tables_to_appear_in_same_query!(- af_collab_metadata,- chat_local_setting_table,- chat_message_table,- chat_table,- collab_snapshot,- local_ai_model_table,- upload_file_part,- upload_file_table,- user_data_migration_records,- user_table,- user_workspace_table,- workspace_members_table,- workspace_setting_table,+ af_collab_metadata,+ chat_local_setting_table,+ chat_message_table,+ chat_table,+ collab_snapshot,+ local_ai_model_table,+ upload_file_part,+ upload_file_table,+ user_data_migration_records,+ user_table,+ user_workspace_table,+ workspace_members_table,+ workspace_setting_table,);