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: bump client api (#6781)
Nathan.fooo28530722bcf6
diff --git a/.github/workflows/rust_ci.yaml b/.github/workflows/rust_ci.yamlindex eab3e7925c..069e535976 100644--- a/.github/workflows/rust_ci.yaml+++ b/.github/workflows/rust_ci.yaml@@ -15,8 +15,6 @@ on:- "main"- "develop"- "release/*"- paths:- - "frontend/rust-lib/**"env:CARGO_TERM_COLOR: alwaysdiff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex f9c2b31150..bcdf99d522 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -172,7 +172,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bincode",@@ -192,7 +192,7 @@ dependencies = [[[package]]name = "appflowy-ai-client"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -888,7 +888,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["again","anyhow",@@ -943,7 +943,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["collab-entity","collab-rt-entity",@@ -956,7 +956,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["futures-channel","futures-util",@@ -1256,7 +1256,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bincode",@@ -1281,7 +1281,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","async-trait",@@ -1553,7 +1553,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1678,7 +1678,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -1687,6 +1687,7 @@ dependencies = ["bytes","chrono","collab-entity",+ "infra","prost","serde","serde_json",@@ -3265,7 +3266,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","futures-util",@@ -3282,7 +3283,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -3714,7 +3715,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -3725,6 +3726,7 @@ dependencies = ["serde_json","tokio","tracing",+ "validator 0.16.1",][[package]]@@ -6398,7 +6400,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -6419,6 +6421,7 @@ dependencies = ["thiserror","tracing","uuid",+ "validator 0.16.1",][[package]]diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 5e51c9ac8b..f1db655d48 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -59,7 +59,7 @@ collab-importer = { version = "0.1" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "648c977c0752609a00ccdfdc5cc8141789e63c4a" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3ba650a07aff3156ebb788bf8283927b48a6a9d6" }[dependencies]serde_json.workspace = truediff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lockindex ccaf7f4af3..d239441f53 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.lock+++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock@@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"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=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -877,7 +877,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["again","anyhow",@@ -932,7 +932,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["collab-entity","collab-rt-entity",@@ -945,7 +945,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["futures-channel","futures-util",@@ -1254,7 +1254,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bincode",@@ -1279,7 +1279,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","async-trait",@@ -1558,7 +1558,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.10",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1683,7 +1683,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -1692,6 +1692,7 @@ dependencies = ["bytes","chrono","collab-entity",+ "infra","prost","serde","serde_json",@@ -3347,7 +3348,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","futures-util",@@ -3364,7 +3365,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -3801,7 +3802,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -3812,6 +3813,7 @@ dependencies = ["serde_json","tokio","tracing",+ "validator 0.16.1",][[package]]@@ -6478,7 +6480,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a#e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -6499,6 +6501,7 @@ dependencies = ["thiserror","tracing","uuid",+ "validator 0.16.1",][[package]]diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.tomlindex 58e28295c0..d17ba9086a 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml@@ -58,7 +58,7 @@ collab-importer = { version = "0.1" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "648c977c0752609a00ccdfdc5cc8141789e63c4a" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3ba650a07aff3156ebb788bf8283927b48a6a9d6" }[dependencies]serde_json.workspace = truediff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex ece80b2bd9..f517b78a25 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"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=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -780,7 +780,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["again","anyhow",@@ -835,7 +835,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["collab-entity","collab-rt-entity",@@ -848,7 +848,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["futures-channel","futures-util",@@ -1117,7 +1117,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bincode",@@ -1142,7 +1142,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","async-trait",@@ -1537,7 +1537,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -1546,6 +1546,7 @@ dependencies = ["bytes","chrono","collab-entity",+ "infra","prost","serde","serde_json",@@ -2979,7 +2980,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","futures-util",@@ -2996,7 +2997,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -3358,7 +3359,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","bytes",@@ -3369,6 +3370,7 @@ dependencies = ["serde_json","tokio","tracing",+ "validator 0.16.1",][[package]]@@ -5663,7 +5665,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=ed4c14d53aa77496a68df0875f5f668f278a21bf#ed4c14d53aa77496a68df0875f5f668f278a21bf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=3ba650a07aff3156ebb788bf8283927b48a6a9d6#3ba650a07aff3156ebb788bf8283927b48a6a9d6"dependencies = ["anyhow","app-error",@@ -5684,6 +5686,7 @@ dependencies = ["thiserror","tracing","uuid",+ "validator 0.16.1",][[package]]diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex f9b1a702e9..9fa65fa49b 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -106,8 +106,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 = "ed4c14d53aa77496a68df0875f5f668f278a21bf" }-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "ed4c14d53aa77496a68df0875f5f668f278a21bf" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3ba650a07aff3156ebb788bf8283927b48a6a9d6" }+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "3ba650a07aff3156ebb788bf8283927b48a6a9d6" }[profile.dev]opt-level = 0diff --git a/frontend/rust-lib/flowy-ai-pub/src/cloud.rs b/frontend/rust-lib/flowy-ai-pub/src/cloud.rsindex d2ce946768..c5293b400c 100644--- a/frontend/rust-lib/flowy-ai-pub/src/cloud.rs+++ b/frontend/rust-lib/flowy-ai-pub/src/cloud.rs@@ -1,13 +1,14 @@use bytes::Bytes;pub use client_api::entity::ai_dto::{- AppFlowyOfflineAI, CompletionType, CreateTextChatContext, LLMModel, LocalAIConfig, ModelInfo,+ AppFlowyOfflineAI, CompletionType, CreateChatContext, LLMModel, LocalAIConfig, ModelInfo,RelatedQuestion, RepeatedRelatedQuestion, StringOrMessage,};pub use client_api::entity::billing_dto::SubscriptionPlan;-pub use client_api::entity::{- ChatAuthorType, ChatMessage, ChatMessageMetadata, ChatMessageType, ChatMetadataContentType,- ChatMetadataData, MessageCursor, QAChatMessage, QuestionStreamValue, RepeatedChatMessage,+pub use client_api::entity::chat_dto::{+ ChatMessage, ChatMessageMetadata, ChatMessageType, ChatRAGData, ContextLoader, MessageCursor,+ RepeatedChatMessage,};+pub use client_api::entity::QuestionStreamValue;use client_api::error::AppResponseError;use flowy_error::FlowyError;use futures::stream::BoxStream;diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rsindex 18efb66887..c3af7fbdca 100644--- a/frontend/rust-lib/flowy-ai/src/event_handler.rs+++ b/frontend/rust-lib/flowy-ai/src/event_handler.rs@@ -7,9 +7,7 @@ use crate::entities::*;use crate::local_ai::local_llm_chat::LLMModelInfo;use crate::notification::{make_notification, ChatNotification, APPFLOWY_AI_NOTIFICATION_KEY};use allo_isolate::Isolate;-use flowy_ai_pub::cloud::{- ChatMessageMetadata, ChatMessageType, ChatMetadataContentType, ChatMetadataData,-};+use flowy_ai_pub::cloud::{ChatMessageMetadata, ChatMessageType, ChatRAGData, ContextLoader};use flowy_error::{ErrorCode, FlowyError, FlowyResult};use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use lib_infra::isolate_stream::IsolateSink;@@ -41,14 +39,14 @@ pub(crate) async fn stream_chat_message_handler(.into_iter().map(|metadata| {let (content_type, content_len) = match metadata.data_type {- ChatMessageMetaTypePB::Txt => (ChatMetadataContentType::Text, metadata.data.len()),- ChatMessageMetaTypePB::Markdown => (ChatMetadataContentType::Markdown, metadata.data.len()),- ChatMessageMetaTypePB::PDF => (ChatMetadataContentType::PDF, 0),- ChatMessageMetaTypePB::UnknownMetaType => (ChatMetadataContentType::Unknown, 0),+ ChatMessageMetaTypePB::Txt => (ContextLoader::Text, metadata.data.len()),+ ChatMessageMetaTypePB::Markdown => (ContextLoader::Markdown, metadata.data.len()),+ ChatMessageMetaTypePB::PDF => (ContextLoader::PDF, 0),+ ChatMessageMetaTypePB::UnknownMetaType => (ContextLoader::Unknown, 0),};ChatMessageMetadata {- data: ChatMetadataData {+ data: ChatRAGData {content: metadata.data,content_type,size: content_len as i64,@@ -56,7 +54,7 @@ pub(crate) async fn stream_chat_message_handler(id: metadata.id,name: metadata.name.clone(),source: metadata.source,- extract: None,+ extra: None,}}).collect::<Vec<_>>();diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/local_llm_chat.rs b/frontend/rust-lib/flowy-ai/src/local_ai/local_llm_chat.rsindex 8155b75872..6e4ac10bc2 100644--- a/frontend/rust-lib/flowy-ai/src/local_ai/local_llm_chat.rs+++ b/frontend/rust-lib/flowy-ai/src/local_ai/local_llm_chat.rs@@ -7,8 +7,8 @@ use appflowy_local_ai::chat_plugin::{AIPluginConfig, AppFlowyLocalAI};use appflowy_plugin::manager::PluginManager;use appflowy_plugin::util::is_apple_silicon;use flowy_ai_pub::cloud::{- AppFlowyOfflineAI, ChatCloudService, ChatMessageMetadata, ChatMetadataContentType, LLMModel,- LocalAIConfig, SubscriptionPlan,+ AppFlowyOfflineAI, ChatCloudService, ChatMessageMetadata, ContextLoader, LLMModel, LocalAIConfig,+ SubscriptionPlan,};use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::kv::KVStorePreferences;@@ -430,13 +430,13 @@ impl LocalAIController {index_metadata.insert("at_name".to_string(), json!(format!("@{}", &metadata.name)));index_metadata.insert("source".to_string(), json!(&metadata.source));match &metadata.data.content_type {- ChatMetadataContentType::Unknown => {+ ContextLoader::Unknown => {error!("[AI Plugin] unsupported content type: {:?}",metadata.data.content_type);},- ChatMetadataContentType::Text | ChatMetadataContentType::Markdown => {+ ContextLoader::Text | ContextLoader::Markdown => {trace!("[AI Plugin]: index text: {}", metadata.data.content);self.process_index_file(@@ -449,7 +449,7 @@ impl LocalAIController {).await?;},- ChatMetadataContentType::PDF => {+ ContextLoader::PDF => {trace!("[AI Plugin]: index pdf file: {}", metadata.data.content);let file_path = Path::new(&metadata.data.content);if file_path.exists() {diff --git a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rsindex 488754b4c2..edd293b239 100644--- a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs@@ -2,7 +2,7 @@ use client_api::collab_sync::{SinkConfig, SyncObject, SyncPlugin};use client_api::entity::ai_dto::{CompletionType, RepeatedRelatedQuestion};use client_api::entity::search_dto::SearchDocumentResponseItem;use client_api::entity::workspace_dto::PublishInfoView;-use client_api::entity::{ChatMessageType, PublishInfo};+use client_api::entity::PublishInfo;use collab::core::origin::{CollabClient, CollabOrigin};use collab::entity::EncodedCollab;use collab::preclude::CollabPlugin;@@ -21,8 +21,8 @@ use collab_integrate::collab_builder::{CollabCloudPluginProvider, CollabPluginProviderContext, CollabPluginProviderType,};use flowy_ai_pub::cloud::{- ChatCloudService, ChatMessage, ChatMessageMetadata, LocalAIConfig, MessageCursor,- RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan,+ ChatCloudService, ChatMessage, ChatMessageMetadata, ChatMessageType, LocalAIConfig,+ MessageCursor, RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan,};use flowy_database_pub::cloud::{DatabaseAIService, DatabaseCloudService, DatabaseSnapshot, EncodeCollabByOid, SummaryRowContent,diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rsindex e40c5de97e..65ee80b6dc 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs@@ -1,6 +1,6 @@use crate::af_cloud::AFServer;use client_api::entity::ai_dto::{CompleteTextParams, CompletionType, RepeatedRelatedQuestion};-use client_api::entity::{+use client_api::entity::chat_dto::{CreateAnswerMessageParams, CreateChatMessageParams, CreateChatParams, MessageCursor,RepeatedChatMessage,};@@ -12,7 +12,7 @@ use flowy_error::FlowyError;use futures_util::{StreamExt, TryStreamExt};use lib_infra::async_trait::async_trait;use lib_infra::util::{get_operating_system, OperatingSystem};-use serde_json::{json, Value};+use serde_json::Value;use std::collections::HashMap;use std::path::Path;@@ -60,7 +60,7 @@ wherelet params = CreateChatMessageParams {content: message.to_string(),message_type,- metadata: Some(json!(metadata)),+ metadata: metadata.to_vec(),};let message = try_get_client?diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rsindex 09e16cd62e..c10c26892a 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs@@ -202,6 +202,7 @@ wherelet workspaces = try_get_client?.get_workspaces_opt(QueryWorkspaceParam {include_member_count: Some(true),+ include_role: Some(true),}).await?;to_user_workspaces(workspaces)diff --git a/frontend/rust-lib/flowy-server/src/default_impl.rs b/frontend/rust-lib/flowy-server/src/default_impl.rsindex 33557b2d53..cf55395c36 100644--- a/frontend/rust-lib/flowy-server/src/default_impl.rs+++ b/frontend/rust-lib/flowy-server/src/default_impl.rs@@ -1,8 +1,7 @@use client_api::entity::ai_dto::{CompletionType, LocalAIConfig, RepeatedRelatedQuestion};-use client_api::entity::{ChatMessageType, MessageCursor, RepeatedChatMessage};use flowy_ai_pub::cloud::{- ChatCloudService, ChatMessage, ChatMessageMetadata, StreamAnswer, StreamComplete,- SubscriptionPlan,+ ChatCloudService, ChatMessage, ChatMessageMetadata, ChatMessageType, MessageCursor,+ RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan,};use flowy_error::FlowyError;use lib_infra::async_trait::async_trait;diff --git a/frontend/rust-lib/flowy-user-pub/src/entities.rs b/frontend/rust-lib/flowy-user-pub/src/entities.rsindex ecaa78021e..aab167e9f6 100644--- a/frontend/rust-lib/flowy-user-pub/src/entities.rs+++ b/frontend/rust-lib/flowy-user-pub/src/entities.rs@@ -143,6 +143,7 @@ pub struct UserWorkspace {pub workspace_database_id: String,#[serde(default)]pub icon: String,+ #[serde(default)]pub member_count: i64,}