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: remove ai model class

Richard Shiue85288119924b
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.dart
index a94c863acd..c43bd01c6f 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
@@ -12,8 +12,8 @@ import 'package:universal_platform/universal_platform.dart';
typedef OnModelStateChangedCallback = void Function(AiType, bool, String);
typedef OnAvailableModelsChangedCallback = void Function(
- List<AiModel>,
- AiModel?,
+ List<AIModelPB>,
+ AIModelPB?,
);
class AIModelStateNotifier {
@@ -133,14 +133,12 @@ class AIModelStateNotifier {
return (AiType.local, hintText, editable);
}
- (List<AiModel>, AiModel?) getAvailableModels() {
+ (List<AIModelPB>, AIModelPB?) getAvailableModels() {
final availableModels = _availableModels;
if (availableModels == null) {
return ([], null);
}
- final models = availableModels.models.map(AiModel.fromPB).toList();
- final selectedModel = AiModel.fromPB(availableModels.selectedModel);
- return (models, selectedModel);
+ return (availableModels.models, availableModels.selectedModel);
}
void _notifyAvailableModelsChanged() {
diff --git a/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart b/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart
index c6c6c03ccf..7ad52b9ec4 100644
--- a/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart
+++ b/frontend/appflowy_flutter/lib/ai/service/select_model_bloc.dart
@@ -3,35 +3,11 @@ import 'dart:async';
import 'package:appflowy/ai/service/ai_model_state_notifier.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/protobuf/flowy-ai/entities.pbserver.dart';
-import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
part 'select_model_bloc.freezed.dart';
-class AiModel extends Equatable {
- const AiModel({
- required this.name,
- required this.isLocal,
- });
-
- factory AiModel.fromPB(AIModelPB pb) {
- return AiModel(name: pb.name, isLocal: pb.isLocal);
- }
-
- AIModelPB toPB() {
- return AIModelPB()
- ..name = name
- ..isLocal = isLocal;
- }
-
- final String name;
- final bool isLocal;
-
- @override
- List<Object?> get props => [name, isLocal];
-}
-
class SelectModelBloc extends Bloc<SelectModelEvent, SelectModelState> {
SelectModelBloc({
required AIModelStateNotifier aiModelStateNotifier,
@@ -44,7 +20,7 @@ class SelectModelBloc extends Bloc<SelectModelEvent, SelectModelState> {
AIEventUpdateSelectedModel(
UpdateSelectedModelPB(
source: _aiModelStateNotifier.objectId,
- selectedModel: model.toPB(),
+ selectedModel: model,
),
).send();
@@ -77,7 +53,10 @@ class SelectModelBloc extends Bloc<SelectModelEvent, SelectModelState> {
await super.close();
}
- void _onAvailableModelsChanged(List<AiModel> models, AiModel? selectedModel) {
+ void _onAvailableModelsChanged(
+ List<AIModelPB> models,
+ AIModelPB? selectedModel,
+ ) {
if (!isClosed) {
add(SelectModelEvent.didLoadModels(models, selectedModel));
}
@@ -87,20 +66,20 @@ class SelectModelBloc extends Bloc<SelectModelEvent, SelectModelState> {
@freezed
class SelectModelEvent with _$SelectModelEvent {
const factory SelectModelEvent.selectModel(
- AiModel model,
+ AIModelPB model,
) = _SelectModel;
const factory SelectModelEvent.didLoadModels(
- List<AiModel> models,
- AiModel? selectedModel,
+ List<AIModelPB> models,
+ AIModelPB? selectedModel,
) = _DidLoadModels;
}
@freezed
class SelectModelState with _$SelectModelState {
const factory SelectModelState({
- required List<AiModel> models,
- required AiModel? selectedModel,
+ required List<AIModelPB> models,
+ required AIModelPB? selectedModel,
}) = _SelectModelState;
factory SelectModelState.initial(AIModelStateNotifier notifier) {
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart
index d6ade94cc5..b9e3daada9 100644
--- a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart
@@ -1,6 +1,7 @@
import 'package:appflowy/ai/ai.dart';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
@@ -72,9 +73,9 @@ class SelectModelPopoverContent extends StatelessWidget {
this.onSelectModel,
});
- final List<AiModel> models;
- final AiModel? selectedModel;
- final void Function(AiModel)? onSelectModel;
+ final List<AIModelPB> models;
+ final AIModelPB? selectedModel;
+ final void Function(AIModelPB)? onSelectModel;
@override
Widget build(BuildContext context) {
@@ -154,7 +155,7 @@ class _ModelItem extends StatelessWidget {
required this.onTap,
});
- final AiModel model;
+ final AIModelPB model;
final bool isSelected;
final VoidCallback onTap;
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
index f8a1b4d20c..4924a42c0d 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
@@ -483,7 +483,7 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
void _regenerateAnswer(
String answerMessageIdString,
PredefinedFormat? format,
- AiModel? model,
+ AIModelPB? model,
) async {
final id = temporaryMessageIDMap.entries
.firstWhereOrNull((e) => e.value == answerMessageIdString)
@@ -507,7 +507,7 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
payload.format = format.toPB();
}
if (model != null) {
- payload.model = model.toPB();
+ payload.model = model;
}
await AIEventRegenerateResponse(payload).send().fold(
@@ -641,7 +641,7 @@ class ChatEvent with _$ChatEvent {
const factory ChatEvent.regenerateAnswer(
String id,
PredefinedFormat? format,
- AiModel? model,
+ AIModelPB? model,
) = _RegenerateAnswer;
// streaming answer
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_change_model_bottom_sheet.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_change_model_bottom_sheet.dart
index 2bf09d5e3c..aa0d840574 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_change_model_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_change_model_bottom_sheet.dart
@@ -1,18 +1,18 @@
-import 'package:appflowy/ai/ai.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/widgets/widgets.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
-Future<AiModel?> showChangeModelBottomSheet(
+Future<AIModelPB?> showChangeModelBottomSheet(
BuildContext context,
- List<AiModel> models,
+ List<AIModelPB> models,
) {
- return showMobileBottomSheet<AiModel?>(
+ return showMobileBottomSheet<AIModelPB?>(
context,
showDragHandle: true,
builder: (context) => _ChangeModelBottomSheetContent(models: models),
@@ -24,7 +24,7 @@ class _ChangeModelBottomSheetContent extends StatefulWidget {
required this.models,
});
- final List<AiModel> models;
+ final List<AIModelPB> models;
@override
State<_ChangeModelBottomSheetContent> createState() =>
@@ -33,7 +33,7 @@ class _ChangeModelBottomSheetContent extends StatefulWidget {
class _ChangeModelBottomSheetContentState
extends State<_ChangeModelBottomSheetContent> {
- AiModel? model;
+ AIModelPB? model;
@override
Widget build(BuildContext context) {
@@ -113,9 +113,9 @@ class _Body extends StatelessWidget {
required this.onSelectModel,
});
- final List<AiModel> models;
- final AiModel? selectedModel;
- final void Function(AiModel) onSelectModel;
+ final List<AIModelPB> models;
+ final AIModelPB? selectedModel;
+ final void Function(AIModelPB) onSelectModel;
@override
Widget build(BuildContext context) {
@@ -130,7 +130,7 @@ class _Body extends StatelessWidget {
}
Widget _buildModelButton(
- AiModel model, [
+ AIModelPB model, [
bool isFirst = false,
]) {
return FlowyOptionTile.checkbox(
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.dart
index 8649e08a5c..150ce20192 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
@@ -21,6 +21,7 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:appflowy_result/appflowy_result.dart';
@@ -49,7 +50,7 @@ class AIMessageActionBar extends StatefulWidget {
final bool showDecoration;
final void Function()? onRegenerate;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
final void Function(bool)? onOverrideVisibility;
@override
@@ -424,7 +425,7 @@ class ChangeModelButton extends StatefulWidget {
final bool isInHoverBar;
final PopoverMutex? popoverMutex;
- final void Function(AiModel)? onRegenerate;
+ final void Function(AIModelPB)? onRegenerate;
final void Function(bool)? onOverrideVisibility;
@override
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.dart
index aa61a3f621..eed5f0a520 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
@@ -12,6 +12,7 @@ import 'package:appflowy/shared/markdown_to_document.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -52,7 +53,7 @@ class ChatAIMessageBubble extends StatelessWidget {
final bool isSelectingMessages;
final void Function()? onRegenerate;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
@override
Widget build(BuildContext context) {
@@ -116,7 +117,7 @@ class ChatAIBottomInlineActions extends StatelessWidget {
final Message message;
final void Function()? onRegenerate;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
@override
Widget build(BuildContext context) {
@@ -158,7 +159,7 @@ class ChatAIMessageHover extends StatefulWidget {
final Message message;
final void Function()? onRegenerate;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
@override
State<ChatAIMessageHover> createState() => _ChatAIMessageHoverState();
@@ -321,7 +322,7 @@ class ChatAIMessagePopup extends StatelessWidget {
final Message message;
final void Function()? onRegenerate;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
@override
Widget build(BuildContext context) {
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
index e181de6570..380767105f 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
@@ -4,6 +4,7 @@ import 'package:appflowy/plugins/ai_chat/application/chat_ai_message_bloc.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_bloc.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_entity.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_message_stream.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:fixnum/fixnum.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -54,7 +55,7 @@ class ChatAIMessageWidget extends StatelessWidget {
final void Function()? onRegenerate;
final void Function() onStopStream;
final void Function(PredefinedFormat)? onChangeFormat;
- final void Function(AiModel)? onChangeModel;
+ final void Function(AIModelPB)? onChangeModel;
final bool isStreaming;
final bool isLastMessage;
final bool isSelectingMessages;