AppFlowy-IO/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-11-23 19:25:10 +03:00
Code Issues Projects Releases Wiki Activity

chore: bump client api (#6781)

Browse Source 
* chore: bump client api

* chore: fix member count serde error
This commit is contained in:
Nathan.fooo 2024-11-14 00:51:07 +08:00 committed by GitHub
parent 3b304747f2
commit 28530722bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 78 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/rust_ci.yaml vendored
View File

@ -15,8 +15,6 @@ on:
- "main" - "main"
- "develop" - "develop"
- "release/*" - "release/*"
paths:
- "frontend/rust-lib/**"
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always

29
frontend/appflowy_tauri/src-tauri/Cargo.lock generated
View File

@ -172,7 +172,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]] [[package]]
name = "app-error" name = "app-error"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -192,7 +192,7 @@ dependencies = [
[[package]] [[package]]
name = "appflowy-ai-client" name = "appflowy-ai-client"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -888,7 +888,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api" name = "client-api"
version = "0.2.0" 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 = [ dependencies = [
"again", "again",
"anyhow", "anyhow",
@ -943,7 +943,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api-entity" name = "client-api-entity"
version = "0.1.0" 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 = [ dependencies = [
"collab-entity", "collab-entity",
"collab-rt-entity", "collab-rt-entity",
@ -956,7 +956,7 @@ dependencies = [
[[package]] [[package]]
name = "client-websocket" name = "client-websocket"
version = "0.1.0" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -1256,7 +1256,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-entity" name = "collab-rt-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -1281,7 +1281,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-protocol" name = "collab-rt-protocol"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -1553,7 +1553,7 @@ dependencies = [
"cssparser-macros", "cssparser-macros",
"dtoa-short", "dtoa-short",
"itoa 1.0.6", "itoa 1.0.6",
"phf 0.8.0", "phf 0.11.2",
"smallvec", "smallvec",
] ]
@ -1678,7 +1678,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]] [[package]]
name = "database-entity" name = "database-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -1687,6 +1687,7 @@ dependencies = [
"bytes", "bytes",
"chrono", "chrono",
"collab-entity", "collab-entity",
"infra",
"prost", "prost",
"serde", "serde",
"serde_json", "serde_json",
@ -3265,7 +3266,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue" name = "gotrue"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"futures-util", "futures-util",
@ -3282,7 +3283,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue-entity" name = "gotrue-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -3714,7 +3715,7 @@ dependencies = [
[[package]] [[package]]
name = "infra" name = "infra"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -3725,6 +3726,7 @@ dependencies = [
"serde_json", "serde_json",
"tokio", "tokio",
"tracing", "tracing",
"validator 0.16.1",
] ]
[[package]] [[package]]
@ -6398,7 +6400,7 @@ dependencies = [
[[package]] [[package]]
name = "shared-entity" name = "shared-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -6419,6 +6421,7 @@ dependencies = [
"thiserror", "thiserror",
"tracing", "tracing",
"uuid", "uuid",
"validator 0.16.1",
] ]
[[package]] [[package]]

2
frontend/appflowy_tauri/src-tauri/Cargo.toml
View File

@ -59,7 +59,7 @@ collab-importer = { version = "0.1" }
# Run the script: # Run the script:
# scripts/tool/update_client_api_rev.sh new_rev_id # 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] [dependencies]
serde_json.workspace = true serde_json.workspace = true

29
frontend/appflowy_web_app/src-tauri/Cargo.lock generated
View File

@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]] [[package]]
name = "app-error" name = "app-error"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -183,7 +183,7 @@ dependencies = [
[[package]] [[package]]
name = "appflowy-ai-client" name = "appflowy-ai-client"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -877,7 +877,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api" name = "client-api"
version = "0.2.0" 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 = [ dependencies = [
"again", "again",
"anyhow", "anyhow",
@ -932,7 +932,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api-entity" name = "client-api-entity"
version = "0.1.0" 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 = [ dependencies = [
"collab-entity", "collab-entity",
"collab-rt-entity", "collab-rt-entity",
@ -945,7 +945,7 @@ dependencies = [
[[package]] [[package]]
name = "client-websocket" name = "client-websocket"
version = "0.1.0" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -1254,7 +1254,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-entity" name = "collab-rt-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -1279,7 +1279,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-protocol" name = "collab-rt-protocol"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -1558,7 +1558,7 @@ dependencies = [
"cssparser-macros", "cssparser-macros",
"dtoa-short", "dtoa-short",
"itoa 1.0.10", "itoa 1.0.10",
"phf 0.8.0", "phf 0.11.2",
"smallvec", "smallvec",
] ]
@ -1683,7 +1683,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
[[package]] [[package]]
name = "database-entity" name = "database-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -1692,6 +1692,7 @@ dependencies = [
"bytes", "bytes",
"chrono", "chrono",
"collab-entity", "collab-entity",
"infra",
"prost", "prost",
"serde", "serde",
"serde_json", "serde_json",
@ -3347,7 +3348,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue" name = "gotrue"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"futures-util", "futures-util",
@ -3364,7 +3365,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue-entity" name = "gotrue-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -3801,7 +3802,7 @@ dependencies = [
[[package]] [[package]]
name = "infra" name = "infra"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -3812,6 +3813,7 @@ dependencies = [
"serde_json", "serde_json",
"tokio", "tokio",
"tracing", "tracing",
"validator 0.16.1",
] ]
[[package]] [[package]]
@ -6478,7 +6480,7 @@ dependencies = [
[[package]] [[package]]
name = "shared-entity" name = "shared-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -6499,6 +6501,7 @@ dependencies = [
"thiserror", "thiserror",
"tracing", "tracing",
"uuid", "uuid",
"validator 0.16.1",
] ]
[[package]] [[package]]

2
frontend/appflowy_web_app/src-tauri/Cargo.toml
View File

@ -58,7 +58,7 @@ collab-importer = { version = "0.1" }
# Run the script: # Run the script:
# scripts/tool/update_client_api_rev.sh new_rev_id # 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] [dependencies]
serde_json.workspace = true serde_json.workspace = true

27
frontend/rust-lib/Cargo.lock generated
View File

@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]] [[package]]
name = "app-error" name = "app-error"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -183,7 +183,7 @@ dependencies = [
[[package]] [[package]]
name = "appflowy-ai-client" name = "appflowy-ai-client"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -780,7 +780,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api" name = "client-api"
version = "0.2.0" 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 = [ dependencies = [
"again", "again",
"anyhow", "anyhow",
@ -835,7 +835,7 @@ dependencies = [
[[package]] [[package]]
name = "client-api-entity" name = "client-api-entity"
version = "0.1.0" 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 = [ dependencies = [
"collab-entity", "collab-entity",
"collab-rt-entity", "collab-rt-entity",
@ -848,7 +848,7 @@ dependencies = [
[[package]] [[package]]
name = "client-websocket" name = "client-websocket"
version = "0.1.0" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -1117,7 +1117,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-entity" name = "collab-rt-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -1142,7 +1142,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-rt-protocol" name = "collab-rt-protocol"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -1537,7 +1537,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]] [[package]]
name = "database-entity" name = "database-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -1546,6 +1546,7 @@ dependencies = [
"bytes", "bytes",
"chrono", "chrono",
"collab-entity", "collab-entity",
"infra",
"prost", "prost",
"serde", "serde",
"serde_json", "serde_json",
@ -2979,7 +2980,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue" name = "gotrue"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"futures-util", "futures-util",
@ -2996,7 +2997,7 @@ dependencies = [
[[package]] [[package]]
name = "gotrue-entity" name = "gotrue-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -3358,7 +3359,7 @@ dependencies = [
[[package]] [[package]]
name = "infra" name = "infra"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -3369,6 +3370,7 @@ dependencies = [
"serde_json", "serde_json",
"tokio", "tokio",
"tracing", "tracing",
"validator 0.16.1",
] ]
[[package]] [[package]]
@ -5663,7 +5665,7 @@ dependencies = [
[[package]] [[package]]
name = "shared-entity" name = "shared-entity"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"app-error", "app-error",
@ -5684,6 +5686,7 @@ dependencies = [
"thiserror", "thiserror",
"tracing", "tracing",
"uuid", "uuid",
"validator 0.16.1",
] ]
[[package]] [[package]]

4
frontend/rust-lib/Cargo.toml
View File

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

9
frontend/rust-lib/flowy-ai-pub/src/cloud.rs
View File

@ -1,13 +1,14 @@
use bytes::Bytes; use bytes::Bytes;
pub use client_api::entity::ai_dto::{ pub use client_api::entity::ai_dto::{
AppFlowyOfflineAI, CompletionType, CreateTextChatContext, LLMModel, LocalAIConfig, ModelInfo, AppFlowyOfflineAI, CompletionType, CreateChatContext, LLMModel, LocalAIConfig, ModelInfo,
RelatedQuestion, RepeatedRelatedQuestion, StringOrMessage, RelatedQuestion, RepeatedRelatedQuestion, StringOrMessage,
}; };
pub use client_api::entity::billing_dto::SubscriptionPlan; pub use client_api::entity::billing_dto::SubscriptionPlan;
pub use client_api::entity::{ pub use client_api::entity::chat_dto::{
ChatAuthorType, ChatMessage, ChatMessageMetadata, ChatMessageType, ChatMetadataContentType, ChatMessage, ChatMessageMetadata, ChatMessageType, ChatRAGData, ContextLoader, MessageCursor,
ChatMetadataData, MessageCursor, QAChatMessage, QuestionStreamValue, RepeatedChatMessage, RepeatedChatMessage,
}; };
pub use client_api::entity::QuestionStreamValue;
use client_api::error::AppResponseError; use client_api::error::AppResponseError;
use flowy_error::FlowyError; use flowy_error::FlowyError;
use futures::stream::BoxStream; use futures::stream::BoxStream;

16
frontend/rust-lib/flowy-ai/src/event_handler.rs
View File

@ -7,9 +7,7 @@ use crate::entities::*;
use crate::local_ai::local_llm_chat::LLMModelInfo; use crate::local_ai::local_llm_chat::LLMModelInfo;
use crate::notification::{make_notification, ChatNotification, APPFLOWY_AI_NOTIFICATION_KEY}; use crate::notification::{make_notification, ChatNotification, APPFLOWY_AI_NOTIFICATION_KEY};
use allo_isolate::Isolate; use allo_isolate::Isolate;
use flowy_ai_pub::cloud::{ use flowy_ai_pub::cloud::{ChatMessageMetadata, ChatMessageType, ChatRAGData, ContextLoader};
ChatMessageMetadata, ChatMessageType, ChatMetadataContentType, ChatMetadataData,
};
use flowy_error::{ErrorCode, FlowyError, FlowyResult}; use flowy_error::{ErrorCode, FlowyError, FlowyResult};
use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult}; use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};
use lib_infra::isolate_stream::IsolateSink; use lib_infra::isolate_stream::IsolateSink;
@ -41,14 +39,14 @@ pub(crate) async fn stream_chat_message_handler(
.into_iter() .into_iter()
.map(|metadata| { .map(|metadata| {
let (content_type, content_len) = match metadata.data_type { let (content_type, content_len) = match metadata.data_type {
ChatMessageMetaTypePB::Txt => (ChatMetadataContentType::Text, metadata.data.len()), ChatMessageMetaTypePB::Txt => (ContextLoader::Text, metadata.data.len()),
ChatMessageMetaTypePB::Markdown => (ChatMetadataContentType::Markdown, metadata.data.len()), ChatMessageMetaTypePB::Markdown => (ContextLoader::Markdown, metadata.data.len()),
ChatMessageMetaTypePB::PDF => (ChatMetadataContentType::PDF, 0), ChatMessageMetaTypePB::PDF => (ContextLoader::PDF, 0),
ChatMessageMetaTypePB::UnknownMetaType => (ChatMetadataContentType::Unknown, 0), ChatMessageMetaTypePB::UnknownMetaType => (ContextLoader::Unknown, 0),
}; };
ChatMessageMetadata { ChatMessageMetadata {
data: ChatMetadataData { data: ChatRAGData {
content: metadata.data, content: metadata.data,
content_type, content_type,
size: content_len as i64, size: content_len as i64,
@ -56,7 +54,7 @@ pub(crate) async fn stream_chat_message_handler(
id: metadata.id, id: metadata.id,
name: metadata.name.clone(), name: metadata.name.clone(),
source: metadata.source, source: metadata.source,
extract: None, extra: None,
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();

10
frontend/rust-lib/flowy-ai/src/local_ai/local_llm_chat.rs
View File

@ -7,8 +7,8 @@ use appflowy_local_ai::chat_plugin::{AIPluginConfig, AppFlowyLocalAI};
use appflowy_plugin::manager::PluginManager; use appflowy_plugin::manager::PluginManager;
use appflowy_plugin::util::is_apple_silicon; use appflowy_plugin::util::is_apple_silicon;
use flowy_ai_pub::cloud::{ use flowy_ai_pub::cloud::{
AppFlowyOfflineAI, ChatCloudService, ChatMessageMetadata, ChatMetadataContentType, LLMModel, AppFlowyOfflineAI, ChatCloudService, ChatMessageMetadata, ContextLoader, LLMModel, LocalAIConfig,
LocalAIConfig, SubscriptionPlan, SubscriptionPlan,
}; };
use flowy_error::{FlowyError, FlowyResult}; use flowy_error::{FlowyError, FlowyResult};
use flowy_sqlite::kv::KVStorePreferences; 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("at_name".to_string(), json!(format!("@{}", &metadata.name)));
index_metadata.insert("source".to_string(), json!(&metadata.source)); index_metadata.insert("source".to_string(), json!(&metadata.source));
match &metadata.data.content_type { match &metadata.data.content_type {
ChatMetadataContentType::Unknown => { ContextLoader::Unknown => {
error!( error!(
"[AI Plugin] unsupported content type: {:?}", "[AI Plugin] unsupported content type: {:?}",
metadata.data.content_type metadata.data.content_type
); );
}, },
ChatMetadataContentType::Text | ChatMetadataContentType::Markdown => { ContextLoader::Text | ContextLoader::Markdown => {
trace!("[AI Plugin]: index text: {}", metadata.data.content); trace!("[AI Plugin]: index text: {}", metadata.data.content);
self self
.process_index_file( .process_index_file(
@ -449,7 +449,7 @@ impl LocalAIController {
) )
.await?; .await?;
}, },
ChatMetadataContentType::PDF => { ContextLoader::PDF => {
trace!("[AI Plugin]: index pdf file: {}", metadata.data.content); trace!("[AI Plugin]: index pdf file: {}", metadata.data.content);
let file_path = Path::new(&metadata.data.content); let file_path = Path::new(&metadata.data.content);
if file_path.exists() { if file_path.exists() {

6
frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
View File

@ -2,7 +2,7 @@ use client_api::collab_sync::{SinkConfig, SyncObject, SyncPlugin};
use client_api::entity::ai_dto::{CompletionType, RepeatedRelatedQuestion}; use client_api::entity::ai_dto::{CompletionType, RepeatedRelatedQuestion};
use client_api::entity::search_dto::SearchDocumentResponseItem; use client_api::entity::search_dto::SearchDocumentResponseItem;
use client_api::entity::workspace_dto::PublishInfoView; 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::core::origin::{CollabClient, CollabOrigin};
use collab::entity::EncodedCollab; use collab::entity::EncodedCollab;
use collab::preclude::CollabPlugin; use collab::preclude::CollabPlugin;
@ -21,8 +21,8 @@ use collab_integrate::collab_builder::{
CollabCloudPluginProvider, CollabPluginProviderContext, CollabPluginProviderType, CollabCloudPluginProvider, CollabPluginProviderContext, CollabPluginProviderType,
}; };
use flowy_ai_pub::cloud::{ use flowy_ai_pub::cloud::{
ChatCloudService, ChatMessage, ChatMessageMetadata, LocalAIConfig, MessageCursor, ChatCloudService, ChatMessage, ChatMessageMetadata, ChatMessageType, LocalAIConfig,
RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan, MessageCursor, RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan,
}; };
use flowy_database_pub::cloud::{ use flowy_database_pub::cloud::{
DatabaseAIService, DatabaseCloudService, DatabaseSnapshot, EncodeCollabByOid, SummaryRowContent, DatabaseAIService, DatabaseCloudService, DatabaseSnapshot, EncodeCollabByOid, SummaryRowContent,

6
frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs
View File

@ -1,6 +1,6 @@
use crate::af_cloud::AFServer; use crate::af_cloud::AFServer;
use client_api::entity::ai_dto::{CompleteTextParams, CompletionType, RepeatedRelatedQuestion}; use client_api::entity::ai_dto::{CompleteTextParams, CompletionType, RepeatedRelatedQuestion};
use client_api::entity::{ use client_api::entity::chat_dto::{
CreateAnswerMessageParams, CreateChatMessageParams, CreateChatParams, MessageCursor, CreateAnswerMessageParams, CreateChatMessageParams, CreateChatParams, MessageCursor,
RepeatedChatMessage, RepeatedChatMessage,
}; };
@ -12,7 +12,7 @@ use flowy_error::FlowyError;
use futures_util::{StreamExt, TryStreamExt}; use futures_util::{StreamExt, TryStreamExt};
use lib_infra::async_trait::async_trait; use lib_infra::async_trait::async_trait;
use lib_infra::util::{get_operating_system, OperatingSystem}; use lib_infra::util::{get_operating_system, OperatingSystem};
use serde_json::{json, Value}; use serde_json::Value;
use std::collections::HashMap; use std::collections::HashMap;
use std::path::Path; use std::path::Path;
@ -60,7 +60,7 @@ where
let params = CreateChatMessageParams { let params = CreateChatMessageParams {
content: message.to_string(), content: message.to_string(),
message_type, message_type,
metadata: Some(json!(metadata)), metadata: metadata.to_vec(),
}; };
let message = try_get_client? let message = try_get_client?

1
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs
View File

@ -202,6 +202,7 @@ where
let workspaces = try_get_client? let workspaces = try_get_client?
.get_workspaces_opt(QueryWorkspaceParam { .get_workspaces_opt(QueryWorkspaceParam {
include_member_count: Some(true), include_member_count: Some(true),
include_role: Some(true),
}) })
.await?; .await?;
to_user_workspaces(workspaces) to_user_workspaces(workspaces)

5
frontend/rust-lib/flowy-server/src/default_impl.rs
View File

@ -1,8 +1,7 @@
use client_api::entity::ai_dto::{CompletionType, LocalAIConfig, RepeatedRelatedQuestion}; use client_api::entity::ai_dto::{CompletionType, LocalAIConfig, RepeatedRelatedQuestion};
use client_api::entity::{ChatMessageType, MessageCursor, RepeatedChatMessage};
use flowy_ai_pub::cloud::{ use flowy_ai_pub::cloud::{
ChatCloudService, ChatMessage, ChatMessageMetadata, StreamAnswer, StreamComplete, ChatCloudService, ChatMessage, ChatMessageMetadata, ChatMessageType, MessageCursor,
SubscriptionPlan, RepeatedChatMessage, StreamAnswer, StreamComplete, SubscriptionPlan,
}; };
use flowy_error::FlowyError; use flowy_error::FlowyError;
use lib_infra::async_trait::async_trait; use lib_infra::async_trait::async_trait;

1
frontend/rust-lib/flowy-user-pub/src/entities.rs
View File

@ -143,6 +143,7 @@ pub struct UserWorkspace {
pub workspace_database_id: String, pub workspace_database_id: String,
#[serde(default)] #[serde(default)]
pub icon: String, pub icon: String,
#[serde(default)]
pub member_count: i64, pub member_count: i64,
} }