Merge pull request #7650 from AppFlowy-IO/display_plugin_version

appflowy · web-flow · commit 3c74208ab9df · 2025-03-30T12:05:25.000+08:00
chore: show plugin version
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_offline_ai_app_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_offline_ai_app_bloc.dart
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart
@@ -44,7 +44,7 @@ class LocalAISettingPanelBloc
   ) async {
     event.when(
       updateAIState: (LocalAIPB pluginState) {
-        if (pluginState.isPluginExecutableReady) {
+        if (pluginState.pluginDownloaded) {
           emit(
             state.copyWith(
               runningState: pluginState.state,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/plugin_state_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/plugin_state_bloc.dart
@@ -91,7 +91,11 @@ class PluginStateBloc extends Bloc<PluginStateEvent, PluginStateState> {
             );
             break;
           case RunningStatePB.Running:
-            emit(const PluginStateState(action: PluginStateAction.running()));
+            emit(
+              PluginStateState(
+                action: PluginStateAction.running(aiState.pluginVersion),
+              ),
+            );
             break;
           case RunningStatePB.Stopped:
             emit(
@@ -140,7 +144,7 @@ class PluginStateAction with _$PluginStateAction {
   const factory PluginStateAction.unknown() = _Unknown;
   const factory PluginStateAction.readToRun() = _ReadyToRun;
   const factory PluginStateAction.initializingPlugin() = _InitializingPlugin;
-  const factory PluginStateAction.running() = _PluginRunning;
+  const factory PluginStateAction.running(String version) = _PluginRunning;
   const factory PluginStateAction.restartPlugin() = _RestartPlugin;
   const factory PluginStateAction.lackOfResource(String desc) = _LackOfResource;
 }
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/plugin_state.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/plugin_state.dart
@@ -1,15 +1,11 @@
-import 'package:appflowy/core/helpers/url_launcher.dart';
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/workspace/application/settings/ai/download_offline_ai_app_bloc.dart';
 import 'package:appflowy/workspace/application/settings/ai/plugin_state_bloc.dart';
 import 'package:appflowy/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -27,7 +23,10 @@ class PluginStateIndicator extends StatelessWidget {
             unknown: () => const SizedBox.shrink(),
             readToRun: () => const _PrepareRunning(),
             initializingPlugin: () => const InitLocalAIIndicator(),
-            running: () => const _LocalAIRunning(),
+            running: (version) => _LocalAIRunning(
+              key: ValueKey(version),
+              version: version,
+            ),
             restartPlugin: () => const _RestartPluginButton(),
             lackOfResource: (desc) => _LackOfResource(desc: desc),
           );
@@ -88,7 +87,9 @@ class _RestartPluginButton extends StatelessWidget {
 }
 
 class _LocalAIRunning extends StatelessWidget {
-  const _LocalAIRunning();
+  const _LocalAIRunning({required this.version, super.key});
+
+  final String version;
 
   @override
   Widget build(BuildContext context) {
@@ -113,6 +114,14 @@ class _LocalAIRunning extends StatelessWidget {
                     color: Color(0xFF2E7D32),
                   ),
                   const HSpace(6),
+                  if (version.isNotEmpty)
+                    Flexible(
+                      child: FlowyText(
+                        "($version) ",
+                        fontSize: 11,
+                        color: const Color(0xFF1E4620),
+                      ),
+                    ),
                   Flexible(
                     child: FlowyText(
                       LocaleKeys.settings_aiPage_keys_localAIRunning.tr(),
@@ -131,95 +140,6 @@ class _LocalAIRunning extends StatelessWidget {
   }
 }
 
-class OpenOrDownloadOfflineAIApp extends StatelessWidget {
-  const OpenOrDownloadOfflineAIApp({required this.onRetry, super.key});
-
-  final VoidCallback onRetry;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => DownloadOfflineAIBloc(),
-      child: BlocBuilder<DownloadOfflineAIBloc, DownloadOfflineAIState>(
-        builder: (context, state) {
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              RichText(
-                maxLines: 3,
-                textAlign: TextAlign.left,
-                text: TextSpan(
-                  children: <TextSpan>[
-                    TextSpan(
-                      text:
-                          "${LocaleKeys.settings_aiPage_keys_offlineAIInstruction1.tr()} ",
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall!
-                          .copyWith(height: 1.5),
-                    ),
-                    TextSpan(
-                      text:
-                          " ${LocaleKeys.settings_aiPage_keys_offlineAIInstruction2.tr()} ",
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: FontSizes.s14,
-                            color: Theme.of(context).colorScheme.primary,
-                            height: 1.5,
-                          ),
-                      recognizer: TapGestureRecognizer()
-                        ..onTap = () => afLaunchUrlString(
-                              "https://docs.appflowy.io/docs/appflowy/product/appflowy-ai-offline",
-                            ),
-                    ),
-                    TextSpan(
-                      text:
-                          " ${LocaleKeys.settings_aiPage_keys_offlineAIInstruction3.tr()} ",
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall!
-                          .copyWith(height: 1.5),
-                    ),
-                    TextSpan(
-                      text:
-                          "${LocaleKeys.settings_aiPage_keys_offlineAIDownload1.tr()} ",
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall!
-                          .copyWith(height: 1.5),
-                    ),
-                    TextSpan(
-                      text:
-                          " ${LocaleKeys.settings_aiPage_keys_offlineAIDownload2.tr()} ",
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: FontSizes.s14,
-                            color: Theme.of(context).colorScheme.primary,
-                            height: 1.5,
-                          ),
-                      recognizer: TapGestureRecognizer()
-                        ..onTap =
-                            () => context.read<DownloadOfflineAIBloc>().add(
-                                  const DownloadOfflineAIEvent.started(),
-                                ),
-                    ),
-                    TextSpan(
-                      text:
-                          " ${LocaleKeys.settings_aiPage_keys_offlineAIDownload3.tr()} ",
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall!
-                          .copyWith(height: 1.5),
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
 class _LackOfResource extends StatelessWidget {
   const _LackOfResource({required this.desc});
 
diff --git a/frontend/resources/translations/ar-SA.json b/frontend/resources/translations/ar-SA.json
@@ -3217,4 +3217,4 @@
     "rewrite": "إعادة كتابة",
     "insertBelow": "أدخل أدناه"
   }
-}
+}
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
@@ -3202,4 +3202,4 @@
     "rewrite": "Rewrite",
     "insertBelow": "Insert below"
   }
-}
+}
diff --git a/frontend/resources/translations/ko-KR.json b/frontend/resources/translations/ko-KR.json
@@ -3185,4 +3185,4 @@
     "rewrite": "다시 작성",
     "insertBelow": "아래에 삽입"
   }
-}
+}
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
@@ -152,6 +152,6 @@ collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFl
 # To update the commit ID, run:
 # scripts/tool/update_local_ai_rev.sh new_rev_id
 # ⚠️⚠️⚠️️
-af-local-ai = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "a7d4ca96ec30cad941b67acb1e0e426d689c1270" }
-af-plugin = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "a7d4ca96ec30cad941b67acb1e0e426d689c1270" }
-af-mcp = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "a7d4ca96ec30cad941b67acb1e0e426d689c1270" }
+af-local-ai = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "4b3d50cbec2f58be2ac385231b8f585f1555e282" }
+af-plugin = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "4b3d50cbec2f58be2ac385231b8f585f1555e282" }
+af-mcp = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-LocalAI", rev = "4b3d50cbec2f58be2ac385231b8f585f1555e282" }
diff --git a/frontend/rust-lib/flowy-ai/src/entities.rs b/frontend/rust-lib/flowy-ai/src/entities.rs
@@ -585,20 +585,17 @@ pub struct LocalAIPB {
   #[pb(index = 1)]
   pub enabled: bool,
 
-  #[pb(index = 2)]
-  pub is_plugin_executable_ready: bool,
-
-  #[pb(index = 3, one_of)]
+  #[pb(index = 2, one_of)]
   pub lack_of_resource: Option<String>,
 
-  #[pb(index = 4)]
+  #[pb(index = 3)]
   pub state: RunningStatePB,
-}
 
-#[derive(Default, ProtoBuf, Clone, Debug)]
-pub struct LocalAIAppLinkPB {
-  #[pb(index = 1)]
-  pub link: String,
+  #[pb(index = 4, one_of)]
+  pub plugin_version: Option<String>,
+
+  #[pb(index = 5)]
+  pub plugin_downloaded: bool,
 }
 
 #[derive(Default, ProtoBuf, Validate, Clone, Debug)]
diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rs
@@ -301,15 +301,6 @@ pub(crate) async fn get_local_ai_state_handler(
   data_result_ok(state)
 }
 
-#[tracing::instrument(level = "debug", skip_all, err)]
-pub(crate) async fn get_offline_app_handler(
-  ai_manager: AFPluginState<Weak<AIManager>>,
-) -> DataResult<LocalAIAppLinkPB, FlowyError> {
-  let ai_manager = upgrade_ai_manager(ai_manager)?;
-  let link = ai_manager.local_ai.get_plugin_download_link().await?;
-  data_result_ok(LocalAIAppLinkPB { link })
-}
-
 #[tracing::instrument(level = "debug", skip_all, err)]
 pub(crate) async fn create_chat_context_handler(
   data: AFPluginData<CreateChatContextPB>,
diff --git a/frontend/rust-lib/flowy-ai/src/event_map.rs b/frontend/rust-lib/flowy-ai/src/event_map.rs
@@ -34,7 +34,6 @@ pub fn init(ai_manager: Weak<AIManager>) -> AFPlugin {
     .event(AIEvent::RestartLocalAI, restart_local_ai_handler)
     .event(AIEvent::ToggleLocalAI, toggle_local_ai_handler)
     .event(AIEvent::GetLocalAIState, get_local_ai_state_handler)
-    .event(AIEvent::GetLocalAIDownloadLink, get_offline_app_handler)
     .event(AIEvent::GetLocalAISetting, get_local_ai_setting_handler)
     .event(
       AIEvent::UpdateLocalAISetting,
@@ -97,9 +96,6 @@ pub enum AIEvent {
   #[event(output = "LocalAIPB")]
   GetLocalAIState = 19,
 
-  #[event(output = "LocalAIAppLinkPB")]
-  GetLocalAIDownloadLink = 22,
-
   #[event(input = "CreateChatContextPB")]
   CreateChatContext = 23,
 
diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs

Original file line number	Diff line number	Diff line change
`@@ -3217,4 +3217,4 @@`
`3217`	`3217`	`"rewrite": "إعادة كتابة",`
`3218`	`3218`	`"insertBelow": "أدخل أدناه"`
`3219`	`3219`	`}`
`3220`		`-}`
	`3220`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3202,4 +3202,4 @@`
`3202`	`3202`	`"rewrite": "Rewrite",`
`3203`	`3203`	`"insertBelow": "Insert below"`
`3204`	`3204`	`}`
`3205`		`-}`
	`3205`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3185,4 +3185,4 @@`
`3185`	`3185`	`"rewrite": "다시 작성",`
`3186`	`3186`	`"insertBelow": "아래에 삽입"`
`3187`	`3187`	`}`
`3188`		`-}`
	`3188`	`+}`