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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: return ai image error (#7263)
Nathan.foooa0867ed68818
diff --git a/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart b/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dartindex 04ec2aaece..560d6d3ef1 100644--- a/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart+++ b/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart@@ -139,6 +139,15 @@ class CompletionStream {);}+ if (event == "AI_IMAGE_RESPONSE_LIMIT") {+ onError(+ AIError(+ message: LocaleKeys.sideBar_aiImageResponseLimit.tr(),+ code: AIErrorCode.aiImageResponseLimitExceeded,+ ),+ );+ }+if (event.startsWith("start:")) {await onStart();}diff --git a/frontend/appflowy_flutter/lib/ai/service/error.dart b/frontend/appflowy_flutter/lib/ai/service/error.dartindex 0912f9bdcf..866a383e0b 100644--- a/frontend/appflowy_flutter/lib/ai/service/error.dart+++ b/frontend/appflowy_flutter/lib/ai/service/error.dart@@ -17,6 +17,8 @@ class AIError with _$AIError {enum AIErrorCode {@JsonValue('AIResponseLimitExceeded')aiResponseLimitExceeded,+ @JsonValue('AIImageResponseLimitExceeded')+ aiImageResponseLimitExceeded,@JsonValue('Other')other,}diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_ai_message_bloc.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_ai_message_bloc.dartindex aeccb1a3ca..f3bef96418 100644--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_ai_message_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_ai_message_bloc.dart@@ -98,6 +98,13 @@ class ChatAIMessageBloc extends Bloc<ChatAIMessageEvent, ChatAIMessageState> {),);},+ onAIImageResponseLimit: () {+ emit(+ state.copyWith(+ messageState: const MessageState.onAIImageResponseLimit(),+ ),+ );+ },receiveMetadata: (metadata) {Log.debug("AI Steps: ${metadata.progress?.step}");emit(@@ -129,6 +136,11 @@ class ChatAIMessageBloc extends Bloc<ChatAIMessageEvent, ChatAIMessageState> {add(const ChatAIMessageEvent.onAIResponseLimit());}},+ onAIImageResponseLimit: () {+ if (!isClosed) {+ add(const ChatAIMessageEvent.onAIImageResponseLimit());+ }+ },onMetadata: (metadata) {if (!isClosed) {add(ChatAIMessageEvent.receiveMetadata(metadata));@@ -145,6 +157,8 @@ class ChatAIMessageEvent with _$ChatAIMessageEvent {const factory ChatAIMessageEvent.retry() = _Retry;const factory ChatAIMessageEvent.retryResult(String text) = _RetryResult;const factory ChatAIMessageEvent.onAIResponseLimit() = _OnAIResponseLimit;+ const factory ChatAIMessageEvent.onAIImageResponseLimit() =+ _OnAIImageResponseLimit;const factory ChatAIMessageEvent.receiveMetadata(MetadataCollection metadata,) = _ReceiveMetadata;@@ -178,6 +192,7 @@ class ChatAIMessageState with _$ChatAIMessageState {class MessageState with _$MessageState {const factory MessageState.onError(String error) = _Error;const factory MessageState.onAIResponseLimit() = _AIResponseLimit;+ const factory MessageState.onAIImageResponseLimit() = _AIImageResponseLimit;const factory MessageState.ready() = _Ready;const factory MessageState.loading() = _Loading;}diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_message_stream.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_message_stream.dartindex 1d883d59b6..c675780838 100644--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_message_stream.dart+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_message_stream.dart@@ -25,6 +25,9 @@ class AnswerStream {} else if (event == "AI_RESPONSE_LIMIT") {_aiLimitReached = true;_onAIResponseLimit?.call();+ } else if (event == "AI_IMAGE_RESPONSE_LIMIT") {+ _aiImageLimitReached = true;+ _onAIImageResponseLimit?.call();}},onDone: () {@@ -42,6 +45,7 @@ class AnswerStream {late StreamSubscription<String> _subscription;bool _hasStarted = false;bool _aiLimitReached = false;+ bool _aiImageLimitReached = false;String? _error;String _text = "";@@ -51,11 +55,13 @@ class AnswerStream {void Function()? _onEnd;void Function(String error)? _onError;void Function()? _onAIResponseLimit;+ void Function()? _onAIImageResponseLimit;void Function(MetadataCollection metadataCollection)? _onMetadata;int get nativePort => _port.sendPort.nativePort;bool get hasStarted => _hasStarted;bool get aiLimitReached => _aiLimitReached;+ bool get aiImageLimitReached => _aiImageLimitReached;String? get error => _error;String get text => _text;@@ -71,6 +77,7 @@ class AnswerStream {void Function()? onEnd,void Function(String error)? onError,void Function()? onAIResponseLimit,+ void Function()? onAIImageResponseLimit,void Function(MetadataCollection metadata)? onMetadata,}) {_onData = onData;@@ -78,6 +85,7 @@ class AnswerStream {_onEnd = onEnd;_onError = onError;_onAIResponseLimit = onAIResponseLimit;+ _onAIImageResponseLimit = onAIImageResponseLimit;_onMetadata = onMetadata;_onStart?.call();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.dartindex e095de5fca..f36a77c0ee 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@@ -132,6 +132,11 @@ class ChatAIMessageWidget extends StatelessWidget {LocaleKeys.sideBar_askOwnerToUpgradeToAIMax.tr(),);},+ onAIImageResponseLimit: () {+ return ChatErrorMessageWidget(+ errorMessage: LocaleKeys.sideBar_purchaseAIMax.tr(),+ );+ },),),);diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 47e2d06db5..6e183167dd 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -380,6 +380,8 @@"askOwnerToUpgradeToProIOS": "Your workspace is running out of free storage.","askOwnerToUpgradeToAIMax": "Your workspace has ran out of free AI responses. Please ask your workspace owner to upgrade the plan or purchase AI add-ons","askOwnerToUpgradeToAIMaxIOS": "Your workspace is running out of free AI responses.",+ "purchaseAIMax": "Your workspace has ran out of free AI Image responses. Please ask your workspace owner to purchase AI Max",+ "aiImageResponseLimit": "You have run out of AI image responses.\n\nGo to Settings -> Plan -> Click AI Max to get more AI image responses","purchaseStorageSpace": "Purchase Storage Space","singleFileProPlanLimitationDescription": "You have exceeded the maximum file upload size allowed in the free plan. Please upgrade to the Pro Plan to upload larger files","purchaseAIResponse": "Purchase ",diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex a8db89812b..c26bb535ff 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -163,7 +163,7 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","bincode",@@ -183,7 +183,7 @@ dependencies = [[[package]]name = "appflowy-ai-client"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","bytes",@@ -786,7 +786,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["again","anyhow",@@ -843,7 +843,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["collab-entity","collab-rt-entity",@@ -856,7 +856,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["futures-channel","futures-util",@@ -1128,7 +1128,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","bincode",@@ -1153,7 +1153,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","async-trait",@@ -1400,7 +1400,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa",- "phf 0.11.2",+ "phf 0.8.0","smallvec",]@@ -1548,7 +1548,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","app-error",@@ -2970,7 +2970,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","futures-util",@@ -2987,7 +2987,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","app-error",@@ -3598,7 +3598,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","bytes",@@ -4624,7 +4624,7 @@ version = "0.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"dependencies = [- "phf_macros 0.8.0",+ "phf_macros","phf_shared 0.8.0","proc-macro-hack",]@@ -4644,7 +4644,6 @@ version = "0.11.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"dependencies = [- "phf_macros 0.11.3","phf_shared 0.11.2",]@@ -4712,19 +4711,6 @@ dependencies = ["syn 1.0.109",]-[[package]]-name = "phf_macros"-version = "0.11.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"-dependencies = [- "phf_generator 0.11.2",- "phf_shared 0.11.2",- "proc-macro2",- "quote",- "syn 2.0.94",-]-[[package]]name = "phf_shared"version = "0.8.0"@@ -6154,7 +6140,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5d9efb4#5d9efb42433db33d593987efe07259fcff123e60"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4a26572a4e43714def9b362d444c640fdf1bc0d9#4a26572a4e43714def9b362d444c640fdf1bc0d9"dependencies = ["anyhow","app-error",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 38995fd527..8435b0f904 100644--- 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 = "5d9efb4" }-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5d9efb4" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4a26572a4e43714def9b362d444c640fdf1bc0d9" }+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4a26572a4e43714def9b362d444c640fdf1bc0d9" }[profile.dev]opt-level = 0diff --git a/frontend/rust-lib/flowy-ai/src/chat.rs b/frontend/rust-lib/flowy-ai/src/chat.rsindex afefce3e06..f6b90e9b00 100644--- a/frontend/rust-lib/flowy-ai/src/chat.rs+++ b/frontend/rust-lib/flowy-ai/src/chat.rs@@ -255,6 +255,10 @@ impl Chat {error!("[Chat] failed to start streaming: {}", err);if err.is_ai_response_limit_exceeded() {let _ = answer_sink.send("AI_RESPONSE_LIMIT".to_string()).await;+ } else if err.is_ai_image_response_limit_exceeded() {+ let _ = answer_sink+ .send("AI_IMAGE_RESPONSE_LIMIT".to_string())+ .await;} else {let _ = answer_sink.send(format!("error:{}", err)).await;}diff --git a/frontend/rust-lib/flowy-ai/src/completion.rs b/frontend/rust-lib/flowy-ai/src/completion.rsindex ccf8e425ad..fd799b411f 100644--- a/frontend/rust-lib/flowy-ai/src/completion.rs+++ b/frontend/rust-lib/flowy-ai/src/completion.rs@@ -147,6 +147,8 @@ impl CompletionTask {async fn handle_error(sink: &mut IsolateSink, error: FlowyError) {if error.is_ai_response_limit_exceeded() {let _ = sink.send("AI_RESPONSE_LIMIT".to_string()).await;+ } else if error.is_ai_image_response_limit_exceeded() {+ let _ = sink.send("AI_IMAGE_RESPONSE_LIMIT".to_string()).await;} else {let _ = sink.send(format!("error:{}", error)).await;}diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rsindex a9d189ff78..36c7b06e6d 100644--- a/frontend/rust-lib/flowy-error/src/code.rs+++ b/frontend/rust-lib/flowy-error/src/code.rs@@ -359,6 +359,9 @@ pub enum ErrorCode {#[error("Requested namespace has one or more invalid characters")]AIServiceUnavailable = 123,++ #[error("AI Image Response limit exceeded")]+ AIImageResponseLimitExceeded = 124,}impl ErrorCode {diff --git a/frontend/rust-lib/flowy-error/src/errors.rs b/frontend/rust-lib/flowy-error/src/errors.rsindex f176f0fccd..d7b085a803 100644--- a/frontend/rust-lib/flowy-error/src/errors.rs+++ b/frontend/rust-lib/flowy-error/src/errors.rs@@ -91,6 +91,10 @@ impl FlowyError {self.code == ErrorCode::AIResponseLimitExceeded}+ pub fn is_ai_image_response_limit_exceeded(&self) -> bool {+ self.code == ErrorCode::AIImageResponseLimitExceeded+ }+static_flowy_error!(internal, ErrorCode::Internal);static_flowy_error!(record_not_found, ErrorCode::RecordNotFound);static_flowy_error!(workspace_initialize, ErrorCode::WorkspaceInitializeError);diff --git a/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs b/frontend/rust-lib/flowy-error/src/impl_from/cloud.rsindex 74e243de93..76c0185f34 100644--- a/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs+++ b/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs@@ -24,6 +24,7 @@ impl From<AppResponseError> for FlowyError {AppErrorCode::WorkspaceLimitExceeded => ErrorCode::WorkspaceLimitExceeded,AppErrorCode::WorkspaceMemberLimitExceeded => ErrorCode::WorkspaceMemberLimitExceeded,AppErrorCode::AIResponseLimitExceeded => ErrorCode::AIResponseLimitExceeded,+ AppErrorCode::AIImageResponseLimitExceeded => ErrorCode::AIImageResponseLimitExceeded,AppErrorCode::FileStorageLimitExceeded => ErrorCode::FileStorageLimitExceeded,AppErrorCode::SingleUploadLimitExceeded => ErrorCode::SingleUploadLimitExceeded,AppErrorCode::CustomNamespaceDisabled => ErrorCode::CustomNamespaceRequirePlanUpgrade,