chore: connect to API

AppFlowy-IO · Jan 3, 2025 · dc0e491 · dc0e491
1 parent 6671422
commit dc0e491
Show file tree

Hide file tree

Showing 16 changed files with 171 additions and 51 deletions.
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
@@ -165,12 +165,13 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
           },
           sendMessage: (
             String message,
+            PredefinedFormat? format,
             Map<String, dynamic>? metadata,
           ) {
             numSendMessage += 1;
 
             _clearRelatedQuestions();
-            _startStreamingMessage(message, metadata);
+            _startStreamingMessage(message, format, metadata);
             lastSentMessage = null;
 
             emit(
@@ -233,7 +234,7 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
           },
           regenerateAnswer: (id, format) {
             _clearRelatedQuestions();
-            _regenerateAnswer(id);
+            _regenerateAnswer(id, format);
             lastSentMessage = null;
 
             emit(
@@ -398,6 +399,7 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
 
   Future<void> _startStreamingMessage(
     String message,
+    PredefinedFormat? format,
     Map<String, dynamic>? metadata,
   ) async {
     await answerStream?.dispose();
@@ -420,6 +422,9 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
       answerStreamPort: Int64(answerStream!.nativePort),
       metadata: await metadataPBFromMetadata(metadata),
     );
+    if (format != null) {
+      payload.format = format.toPB();
+    }
 
     // stream the question to the server
     await AIEventStreamMessage(payload).send().fold(
@@ -460,7 +465,10 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
     );
   }
 
-  void _regenerateAnswer(String answerMessageIdString) async {
+  void _regenerateAnswer(
+    String answerMessageIdString,
+    PredefinedFormat? format,
+  ) async {
     final id = temporaryMessageIDMap.entries
             .firstWhereOrNull((e) => e.value == answerMessageIdString)
             ?.key ??
@@ -479,6 +487,9 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
       answerMessageId: answerMessageId,
       answerStreamPort: Int64(answerStream!.nativePort),
     );
+    if (format != null) {
+      payload.format = format.toPB();
+    }
 
     await AIEventRegenerateResponse(payload).send().fold(
       (success) {
@@ -586,6 +597,7 @@ class ChatEvent with _$ChatEvent {
   // send message
   const factory ChatEvent.sendMessage({
     required String message,
+    PredefinedFormat? format,
     Map<String, dynamic>? metadata,
   }) = _SendMessage;
   const factory ChatEvent.finishSending() = _FinishSendMessage;

diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_entity.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_entity.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy_backend/protobuf/flowy-ai/entities.pbenum.dart';
+import 'package:appflowy_backend/protobuf/flowy-ai/protobuf.dart';
 import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -154,6 +155,23 @@ class PredefinedFormat extends Equatable {
   final ImageFormat imageFormat;
   final TextFormat? textFormat;
 
+  PredefinedFormatPB toPB() {
+    return PredefinedFormatPB(
+      imageFormat: switch (imageFormat) {
+        ImageFormat.text => ResponseImageFormatPB.TextOnly,
+        ImageFormat.image => ResponseImageFormatPB.ImageOnly,
+        ImageFormat.textAndImage => ResponseImageFormatPB.TextAndImage,
+      },
+      textFormat: switch (textFormat) {
+        TextFormat.auto => ResponseTextFormatPB.Paragraph,
+        TextFormat.bulletList => ResponseTextFormatPB.BulletedList,
+        TextFormat.numberedList => ResponseTextFormatPB.NumberedList,
+        TextFormat.table => ResponseTextFormatPB.Table,
+        null => null
+      },
+    );
+  }
+
   @override
   List<Object?> get props => [imageFormat, textFormat];
 }

diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
@@ -291,10 +291,11 @@ class _ChatContentPage extends StatelessWidget {
                   onStopStreaming: () {
                     chatBloc.add(const ChatEvent.stopStream());
                   },
-                  onSubmitted: (text, metadata) {
+                  onSubmitted: (text, format, metadata) {
                     chatBloc.add(
                       ChatEvent.sendMessage(
                         message: text,
+                        format: format,
                         metadata: metadata,
                       ),
                     );
@@ -313,10 +314,11 @@ class _ChatContentPage extends StatelessWidget {
                   onStopStreaming: () {
                     chatBloc.add(const ChatEvent.stopStream());
                   },
-                  onSubmitted: (text, metadata) {
+                  onSubmitted: (text, format, metadata) {
                     chatBloc.add(
                       ChatEvent.sendMessage(
                         message: text,
+                        format: format,
                         metadata: metadata,
                       ),
                     );

diff --git a/...appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_ai_prompt_input.dart b/...appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_ai_prompt_input.dart
@@ -33,7 +33,8 @@ class DesktopAIPromptInput extends StatefulWidget {
   final String chatId;
   final bool isStreaming;
   final void Function() onStopStreaming;
-  final void Function(String, Map<String, dynamic>) onSubmitted;
+  final void Function(String, PredefinedFormat?, Map<String, dynamic>)
+      onSubmitted;
   final void Function(List<String>) onUpdateSelectedSources;
 
   @override
@@ -252,14 +253,13 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
     }
 
     // get the attached files and mentioned pages
-    final metadata = {
-      ...context.read<AIPromptInputBloc>().consumeMetadata(),
-      if (showPredefinedFormatSection) ...{
-        "format": predefinedFormat,
-      },
-    };
+    final metadata = context.read<AIPromptInputBloc>().consumeMetadata();
 
-    widget.onSubmitted(trimmedText, metadata);
+    if (showPredefinedFormatSection) {
+      widget.onSubmitted(trimmedText, predefinedFormat, metadata);
+    } else {
+      widget.onSubmitted(trimmedText, null, metadata);
+    }
   }
 
   void handleTextControllerChanged() {

diff --git a/.../appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_ai_prompt_input.dart b/.../appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_ai_prompt_input.dart
@@ -30,7 +30,8 @@ class MobileAIPromptInput extends StatefulWidget {
   final String chatId;
   final bool isStreaming;
   final void Function() onStopStreaming;
-  final void Function(String, Map<String, dynamic>) onSubmitted;
+  final void Function(String, PredefinedFormat?, Map<String, dynamic>)
+      onSubmitted;
   final void Function(List<String>) onUpdateSelectedSources;
 
   @override
@@ -183,14 +184,13 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
     }
 
     // get the attached files and mentioned pages
-    final metadata = {
-      ...context.read<AIPromptInputBloc>().consumeMetadata(),
-      if (showPredefinedFormatSection) ...{
-        "format": predefinedFormat,
-      },
-    };
+    final metadata = context.read<AIPromptInputBloc>().consumeMetadata();
 
-    widget.onSubmitted(trimmedText, metadata);
+    if (showPredefinedFormatSection) {
+      widget.onSubmitted(trimmedText, predefinedFormat, metadata);
+    } else {
+      widget.onSubmitted(trimmedText, null, metadata);
+    }
   }
 
   void handleTextControllerChange() {

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
@@ -103,8 +103,8 @@ dashmap = "6.0.1"
 # Run the script.add_workspace_members:
 # scripts/tool/update_client_api_rev.sh  new_rev_id
 # ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "9ace96286e39e9868f47088c4065b77cf31d5d6f" }
-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "9ace96286e39e9868f47088c4065b77cf31d5d6f" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bb590c0d843c350a111a4bd079864ef1bd2583e1" }
+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bb590c0d843c350a111a4bd079864ef1bd2583e1" }
 
 [profile.dev]
 opt-level = 0

diff --git a/frontend/rust-lib/flowy-ai-pub/src/cloud.rs b/frontend/rust-lib/flowy-ai-pub/src/cloud.rs
@@ -1,7 +1,8 @@
 use bytes::Bytes;
 pub use client_api::entity::ai_dto::{
   AppFlowyOfflineAI, CompletionType, CreateChatContext, LLMModel, LocalAIConfig, ModelInfo,
-  RelatedQuestion, RepeatedRelatedQuestion, StringOrMessage,
+  OutputContent, OutputLayout, RelatedQuestion, RepeatedRelatedQuestion, ResponseFormat,
+  StringOrMessage,
 };
 pub use client_api::entity::billing_dto::SubscriptionPlan;
 pub use client_api::entity::chat_dto::{
@@ -53,6 +54,7 @@ pub trait ChatCloudService: Send + Sync + 'static {
     workspace_id: &str,
     chat_id: &str,
     message_id: i64,
+    format: ResponseFormat,
   ) -> Result<StreamAnswer, FlowyError>;
 
   async fn get_answer(

diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rs
@@ -1,6 +1,7 @@
 use crate::chat::Chat;
 use crate::entities::{
-  ChatInfoPB, ChatMessageListPB, ChatMessagePB, ChatSettingsPB, FilePB, RepeatedRelatedQuestionPB,
+  ChatInfoPB, ChatMessageListPB, ChatMessagePB, ChatSettingsPB, FilePB, PredefinedFormatPB,
+  RepeatedRelatedQuestionPB,
 };
 use crate::local_ai::local_llm_chat::LocalAIController;
 use crate::middleware::chat_service_mw::AICloudServiceMiddleware;
@@ -219,6 +220,7 @@ impl AIManager {
     message_type: ChatMessageType,
     answer_stream_port: i64,
     question_stream_port: i64,
+    format: Option<PredefinedFormatPB>,
     metadata: Vec<ChatMessageMetadata>,
   ) -> Result<ChatMessagePB, FlowyError> {
     let chat = self.get_or_create_chat_instance(chat_id).await?;
@@ -228,6 +230,7 @@ impl AIManager {
         message_type,
         answer_stream_port,
         question_stream_port,
+        format,
         metadata,
       )
       .await?;
@@ -243,13 +246,14 @@ impl AIManager {
     chat_id: &str,
     answer_message_id: i64,
     answer_stream_port: i64,
+    format: Option<PredefinedFormatPB>,
   ) -> FlowyResult<()> {
     let chat = self.get_or_create_chat_instance(chat_id).await?;
     let question_message_id = chat
       .get_question_id_from_answer_id(answer_message_id)
       .await?;
     chat
-      .stream_regenerate_response(question_message_id, answer_stream_port)
+      .stream_regenerate_response(question_message_id, answer_stream_port, format)
       .await?;
     Ok(())
   }