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: hide predefined format section when using local ai

Richard Shiue96608bd005eb
diff --git a/frontend/appflowy_flutter/lib/ai/service/ai_prompt_input_bloc.dart b/frontend/appflowy_flutter/lib/ai/service/ai_prompt_input_bloc.dart
index 2cad319cdd..7751a3357e 100644
--- a/frontend/appflowy_flutter/lib/ai/service/ai_prompt_input_bloc.dart
+++ b/frontend/appflowy_flutter/lib/ai/service/ai_prompt_input_bloc.dart
@@ -36,35 +36,31 @@ class AIPromptInputBloc extends Bloc<AIPromptInputEvent, AIPromptInputState> {
on<AIPromptInputEvent>(
(event, emit) {
event.when(
- updateAIState: (LocalAIPB localAIState) {
+ updateAIState: (localAIState) {
+ AiType aiType = localAIState.enabled ? AiType.local : AiType.cloud;
+ bool supportChatWithFile =
+ aiType.isLocal && localAIState.state == RunningStatePB.Running;
+
if (localAIState.hasLackOfResource()) {
- emit(
- state.copyWith(
- aiType: AIType.appflowyAI,
- supportChatWithFile: false,
- localAIState: localAIState,
- ),
- );
- return;
+ aiType = AiType.cloud;
+ supportChatWithFile = false;
}
- // Only user enable chat with file and the plugin is already running
- final supportChatWithFile = localAIState.enabled &&
- localAIState.state == RunningStatePB.Running;
-
- final aiType =
- localAIState.enabled ? AIType.localAI : AIType.appflowyAI;
+ final showPredefinedFormats =
+ aiType.isCloud && state.showPredefinedFormats;
emit(
state.copyWith(
aiType: aiType,
supportChatWithFile: supportChatWithFile,
localAIState: localAIState,
+ showPredefinedFormats: showPredefinedFormats,
),
);
},
toggleShowPredefinedFormat: () {
+ final showPredefinedFormats = !state.showPredefinedFormats;
final predefinedFormat =
- !state.showPredefinedFormats && state.predefinedFormat == null
+ showPredefinedFormats && state.predefinedFormat == null
? PredefinedFormat(
imageFormat: ImageFormat.text,
textFormat: TextFormat.paragraph,
@@ -72,12 +68,15 @@ class AIPromptInputBloc extends Bloc<AIPromptInputEvent, AIPromptInputState> {
: null;
emit(
state.copyWith(
- showPredefinedFormats: !state.showPredefinedFormats,
+ showPredefinedFormats: showPredefinedFormats,
predefinedFormat: predefinedFormat,
),
);
},
updatePredefinedFormat: (format) {
+ if (!state.showPredefinedFormats) {
+ return;
+ }
emit(state.copyWith(predefinedFormat: format));
},
attachFile: (filePath, fileName) {
@@ -176,7 +175,7 @@ class AIPromptInputEvent with _$AIPromptInputEvent {
@freezed
class AIPromptInputState with _$AIPromptInputState {
const factory AIPromptInputState({
- required AIType aiType,
+ required AiType aiType,
required bool supportChatWithFile,
required bool showPredefinedFormats,
required PredefinedFormat? predefinedFormat,
@@ -187,7 +186,7 @@ class AIPromptInputState with _$AIPromptInputState {
factory AIPromptInputState.initial(PredefinedFormat? format) =>
AIPromptInputState(
- aiType: AIType.appflowyAI,
+ aiType: AiType.cloud,
supportChatWithFile: false,
showPredefinedFormats: format != null,
predefinedFormat: format,
@@ -197,9 +196,10 @@ class AIPromptInputState with _$AIPromptInputState {
);
}
-enum AIType {
- appflowyAI,
- localAI;
+enum AiType {
+ cloud,
+ local;
- bool get isLocalAI => this == localAI;
+ bool get isCloud => this == cloud;
+ bool get isLocal => this == local;
}
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_prompt_text_field.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_prompt_text_field.dart
index 0905e9b6bc..5bb7eb1c0d 100644
--- a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_prompt_text_field.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_prompt_text_field.dart
@@ -283,10 +283,10 @@ class _DesktopPromptInputState extends State<DesktopPromptInput> {
return;
}
- // handle text and selection changes ONLY when mentioning a page
-
// disable mention
return;
+
+ // handle text and selection changes ONLY when mentioning a page
// ignore: dead_code
if (!overlayController.isShowing ||
inputControlCubit.filterStartPosition == -1) {
@@ -384,8 +384,8 @@ class _DesktopPromptInputState extends State<DesktopPromptInput> {
contentPadding:
calculateContentPadding(state.showPredefinedFormats),
hintText: switch (state.aiType) {
- AIType.appflowyAI => LocaleKeys.chat_inputMessageHint.tr(),
- AIType.localAI => LocaleKeys.chat_inputLocalAIMessageHint.tr()
+ AiType.cloud => LocaleKeys.chat_inputMessageHint.tr(),
+ AiType.local => LocaleKeys.chat_inputLocalAIMessageHint.tr()
},
);
},
@@ -578,29 +578,34 @@ class _PromptBottomActions extends StatelessWidget {
child: _sendButton(),
);
}
- return Row(
- children: [
- _predefinedFormatButton(),
- const Spacer(),
- if (state.aiType == AIType.appflowyAI) ...[
- _selectSourcesButton(context),
- const HSpace(
- DesktopAIChatSizes.inputActionBarButtonSpacing,
- ),
- ],
- // _mentionButton(context),
- // const HSpace(
- // DesktopAIPromptSizes.actionBarButtonSpacing,
- // ),
- if (state.supportChatWithFile) ...[
- _attachmentButton(context),
- const HSpace(
- DesktopAIChatSizes.inputActionBarButtonSpacing,
- ),
- ],
- _sendButton(),
- ],
- );
+ return state.aiType.isLocal
+ ? Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ if (state.supportChatWithFile) ...[
+ _attachmentButton(context),
+ const HSpace(
+ DesktopAIChatSizes.inputActionBarButtonSpacing,
+ ),
+ ],
+ _sendButton(),
+ ],
+ )
+ : Row(
+ children: [
+ _predefinedFormatButton(),
+ const Spacer(),
+ _selectSourcesButton(context),
+ const HSpace(
+ DesktopAIChatSizes.inputActionBarButtonSpacing,
+ ),
+ // _mentionButton(context),
+ // const HSpace(
+ // DesktopAIPromptSizes.actionBarButtonSpacing,
+ // ),
+ _sendButton(),
+ ],
+ );
},
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
index 4d5cd82098..0aa7465dfb 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
@@ -268,8 +268,8 @@ class _MobileChatInputState extends State<MobileChatInput> {
focusedBorder: InputBorder.none,
contentPadding: MobileAIPromptSizes.textFieldContentPadding,
hintText: switch (state.aiType) {
- AIType.appflowyAI => LocaleKeys.chat_inputMessageHint.tr(),
- AIType.localAI => LocaleKeys.chat_inputLocalAIMessageHint.tr()
+ AiType.cloud => LocaleKeys.chat_inputMessageHint.tr(),
+ AiType.local => LocaleKeys.chat_inputLocalAIMessageHint.tr()
},
hintStyle: inputHintTextStyle(context),
isCollapsed: true,
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.dart
index 6c9ebe2a3f..8555d8cdc8 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
@@ -8,6 +8,7 @@ import 'package:bloc/bloc.dart';
import 'package:collection/collection.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:equatable/equatable.dart';
+
part 'ollama_setting_bloc.freezed.dart';
class OllamaSettingBloc extends Bloc<OllamaSettingEvent, OllamaSettingState> {
diff --git a/frontend/appflowy_flutter/macos/Podfile.lock b/frontend/appflowy_flutter/macos/Podfile.lock
index b4a1a3d20d..30ee626f09 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: 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
+ 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
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
- hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023c
- irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
- local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
- package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
- path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+ hotkey_manager: b443f35f4d772162937aa73fd8995e579f8ac4e2
+ irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
+ local_notifier: ebf072651e35ae5e47280ad52e2707375cb2ae4e
+ package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+ path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
- screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
+ screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
- sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
- share_plus: 1fa619de8392a4398bfaf176d441853922614e89
- shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+ sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90
+ share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+ shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
Sparkle: 5f8960a7a119aa7d45dacc0d5837017170bc5675
- sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
- super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
- url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
- webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
- window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
+ sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+ super_native_extensions: c2795d6d9aedf4a79fae25cb6160b71b50549189
+ url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
+ webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c
+ window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
PODFILE CHECKSUM: 0532f3f001ca3110b8be345d6491fff690e95823