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: code cleanup

Richard Shiue01e5817b2437
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart
deleted file mode 100644
index f533778f9b..0000000000
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart
+++ /dev/null
@@ -1,78 +0,0 @@
-import 'dart:async';
-
-import 'package:appflowy_backend/dispatch/dispatch.dart';
-import 'package:appflowy_backend/protobuf/flowy-ai/entities.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
-import 'package:appflowy_result/appflowy_result.dart';
-import 'package:bloc/bloc.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-part 'local_ai_chat_toggle_bloc.freezed.dart';
-
-class LocalAIChatToggleBloc
- extends Bloc<LocalAIChatToggleEvent, LocalAIChatToggleState> {
- LocalAIChatToggleBloc() : super(const LocalAIChatToggleState()) {
- on<LocalAIChatToggleEvent>(_handleEvent);
- }
-
- Future<void> _handleEvent(
- LocalAIChatToggleEvent event,
- Emitter<LocalAIChatToggleState> emit,
- ) async {
- await event.when(
- started: () async {
- final result = await AIEventGetLocalAIState().send();
- _handleResult(emit, result);
- },
- handleResult: (result) {
- _handleResult(emit, result);
- },
- );
- }
-
- void _handleResult(
- Emitter<LocalAIChatToggleState> emit,
- FlowyResult<LocalAIPB, FlowyError> result,
- ) {
- result.fold(
- (localAI) {
- emit(
- state.copyWith(
- pageIndicator:
- LocalAIChatToggleStateIndicator.ready(localAI.enabled),
- ),
- );
- },
- (err) {
- emit(
- state.copyWith(
- pageIndicator: LocalAIChatToggleStateIndicator.error(err),
- ),
- );
- },
- );
- }
-}
-
-@freezed
-class LocalAIChatToggleEvent with _$LocalAIChatToggleEvent {
- const factory LocalAIChatToggleEvent.started() = _Started;
- const factory LocalAIChatToggleEvent.handleResult(
- FlowyResult<LocalAIPB, FlowyError> result,
- ) = _HandleResult;
-}
-
-@freezed
-class LocalAIChatToggleState with _$LocalAIChatToggleState {
- const factory LocalAIChatToggleState({
- @Default(LocalAIChatToggleStateIndicator.loading())
- LocalAIChatToggleStateIndicator pageIndicator,
- }) = _LocalAIChatToggleState;
-}
-
-@freezed
-class LocalAIChatToggleStateIndicator with _$LocalAIChatToggleStateIndicator {
- const factory LocalAIChatToggleStateIndicator.error(FlowyError error) =
- _OnError;
- const factory LocalAIChatToggleStateIndicator.ready(bool isEnabled) = _Ready;
- const factory LocalAIChatToggleStateIndicator.loading() = _Loading;
-}
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart
similarity index 87%
rename from frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_bloc.dart
rename to frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart
index ed55ffcf9b..5ed82c601a 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart
@@ -8,13 +8,15 @@ import 'package:appflowy_result/appflowy_result.dart';
import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
-part 'local_ai_chat_bloc.freezed.dart';
+part 'local_ai_setting_panel_bloc.freezed.dart';
class LocalAISettingPanelBloc
extends Bloc<LocalAISettingPanelEvent, LocalAISettingPanelState> {
LocalAISettingPanelBloc()
: listener = LocalLLMListener(),
super(const LocalAISettingPanelState()) {
+ on<LocalAISettingPanelEvent>(_handleEvent);
+
listener.start(
stateCallback: (newState) {
if (!isClosed) {
@@ -23,7 +25,14 @@ class LocalAISettingPanelBloc
},
);
- on<LocalAISettingPanelEvent>(_handleEvent);
+ AIEventGetLocalAIState().send().fold(
+ (localAIState) {
+ if (!isClosed) {
+ add(LocalAISettingPanelEvent.updateAIState(localAIState));
+ }
+ },
+ Log.error,
+ );
}
final LocalLLMListener listener;
@@ -34,16 +43,6 @@ class LocalAISettingPanelBloc
Emitter<LocalAISettingPanelState> emit,
) async {
event.when(
- started: () {
- AIEventGetLocalAIState().send().fold(
- (localAIState) {
- if (!isClosed) {
- add(LocalAISettingPanelEvent.updateAIState(localAIState));
- }
- },
- Log.error,
- );
- },
updateAIState: (LocalAIPB pluginState) {
if (pluginState.isPluginExecutableReady) {
emit(
@@ -72,7 +71,6 @@ class LocalAISettingPanelBloc
@freezed
class LocalAISettingPanelEvent with _$LocalAISettingPanelEvent {
- const factory LocalAISettingPanelEvent.started() = _Started;
const factory LocalAISettingPanelEvent.updateAIState(
LocalAIPB aiState,
) = _UpdateAIState;
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart
index 3f557eff91..cf9410dad9 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart
@@ -1,6 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/workspace/application/settings/ai/local_ai_chat_bloc.dart';
+import 'package:appflowy/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-ai/entities.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart
index 2a88008565..46935a2450 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart
@@ -12,14 +12,9 @@ import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-class LocalAISetting extends StatefulWidget {
+class LocalAISetting extends StatelessWidget {
const LocalAISetting({super.key});
- @override
- State<LocalAISetting> createState() => _LocalAISettingState();
-}
-
-class _LocalAISettingState extends State<LocalAISetting> {
@override
Widget build(BuildContext context) {
return BlocBuilder<SettingsAIBloc, SettingsAIState>(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting_panel.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting_panel.dart
index 6b95f2e9d2..c379cf6089 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting_panel.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting_panel.dart
@@ -1,5 +1,4 @@
-import 'package:appflowy/workspace/application/settings/ai/local_ai_chat_bloc.dart';
-import 'package:appflowy/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart';
+import 'package:appflowy/workspace/application/settings/ai/local_ai_setting_panel_bloc.dart';
import 'package:appflowy/workspace/presentation/settings/pages/setting_ai_view/ollma_setting.dart';
import 'package:expandable/expandable.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
@@ -12,14 +11,8 @@ class LocalAISettingPanel extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return MultiBlocProvider(
- providers: [
- BlocProvider(create: (context) => LocalAISettingPanelBloc()),
- BlocProvider(
- create: (context) => LocalAIChatToggleBloc()
- ..add(const LocalAIChatToggleEvent.started()),
- ),
- ],
+ return BlocProvider(
+ create: (context) => LocalAISettingPanelBloc(),
child: ExpandableNotifier(
initialExpanded: true,
child: ExpandablePanel(
@@ -34,28 +27,24 @@ class LocalAISettingPanel extends StatelessWidget {
collapsed: const SizedBox.shrink(),
expanded: Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
+ child:
BlocBuilder<LocalAISettingPanelBloc, LocalAISettingPanelState>(
- builder: (context, state) {
+ builder: (context, state) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
// If the progress indicator is startLocalAIApp, then don't show the LLM model.
if (state.progressIndicator ==
- const LocalAIProgress.downloadLocalAIApp()) {
- return const SizedBox.shrink();
- } else {
- return Column(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: const [
- OllamaSettingPage(),
- VSpace(6),
- _LocalAIStateWidget(),
- ],
- );
- }
- },
- ),
- ],
+ const LocalAIProgress.downloadLocalAIApp())
+ const SizedBox.shrink()
+ else ...[
+ OllamaSettingPage(),
+ VSpace(6),
+ PluginStateIndicator(),
+ ],
+ ],
+ );
+ },
),
),
),
@@ -63,16 +52,3 @@ class LocalAISettingPanel extends StatelessWidget {
);
}
}
-
-class _LocalAIStateWidget extends StatelessWidget {
- const _LocalAIStateWidget();
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<LocalAISettingPanelBloc, LocalAISettingPanelState>(
- builder: (context, state) {
- return const PluginStateIndicator();
- },
- );
- }
-}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollma_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollma_setting.dart
index 04bd27372a..bc190b895a 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollma_setting.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/ollma_setting.dart
@@ -29,6 +29,7 @@ class OllamaSettingPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ListView.separated(
+ physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: state.inputItems.length,
separatorBuilder: (_, __) => const VSpace(10),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart
index a6181ba016..7e795306fb 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart
@@ -13,7 +13,6 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -150,23 +149,21 @@ class _LocalAIOnBoarding extends StatelessWidget {
child: BlocBuilder<LocalAIOnBoardingBloc, LocalAIOnBoardingState>(
builder: (context, state) {
// Show the local AI settings if the user has purchased the AI Local plan
- if (kDebugMode || state.isPurchaseAILocal) {
+ if (state.isPurchaseAILocal) {
return const LocalAISetting();
+ } else if (currentWorkspaceMemberRole?.isOwner ?? false) {
+ // Show the upgrade to AI Local plan button if the user has not purchased the AI Local plan
+ return _UpgradeToAILocalPlan(
+ onTap: () {
+ context.read<LocalAIOnBoardingBloc>().add(
+ const LocalAIOnBoardingEvent.addSubscription(
+ SubscriptionPlanPB.AiLocal,
+ ),
+ );
+ },
+ );
} else {
- if (currentWorkspaceMemberRole?.isOwner ?? false) {
- // Show the upgrade to AI Local plan button if the user has not purchased the AI Local plan
- return _UpgradeToAILocalPlan(
- onTap: () {
- context.read<LocalAIOnBoardingBloc>().add(
- const LocalAIOnBoardingEvent.addSubscription(
- SubscriptionPlanPB.AiLocal,
- ),
- );
- },
- );
- } else {
- return const _AskOwnerUpgradeToLocalAI();
- }
+ return const _AskOwnerUpgradeToLocalAI();
}
},
),