xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-08-09 04:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloud): converge legacy revision-zero members

Browse Source
This commit is contained in:
Chan
2026-08-06 13:09:42 +00:00
parent ddb6dbf593
commit 2af4e111aa
2 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/langbot/pkg/cloud/directory_projection.py
+15 -5
View File
@@ -865,6 +865,12 @@ class DirectoryProjectionService:
)
).all()
}
existing_account_sources: dict[str, str] = {}
if existing:
existing_account_sources = {
account.uuid: account.source
for account in (await session.scalars(sqlalchemy.select(User).where(User.uuid.in_(existing)))).all()
}
included_accounts: set[str] = set()
for member in candidate.members:
included_accounts.add(member.account_uuid)
@@ -891,10 +897,13 @@ class DirectoryProjectionService:
)
)
continue
if membership.projection_revision == 0:
# Revision zero is Core-owned collaboration state. Directory
# projection seeds memberships, but must not overwrite later
# invitation, role, or removal decisions made by Core.
if (
membership.projection_revision == 0
and existing_account_sources.get(member.account_uuid) != AccountSource.CLOUD_PROJECTION.value
):
# Keep genuinely local collaboration state. Historical Cloud
# memberships also used revision zero; once Space includes the
# account in its authoritative directory, adopt that row.
continue
if membership.uuid != member.membership_uuid:
raise DirectoryProjectionUnavailableError('Directory membership UUID changed for one account')
@@ -910,7 +919,8 @@ class DirectoryProjectionService:
membership.projection_revision = member.projection_revision
for account_uuid, membership in existing.items():
if account_uuid not in included_accounts and membership.projection_revision != 0:
space_owned = existing_account_sources.get(account_uuid) == AccountSource.CLOUD_PROJECTION.value
if account_uuid not in included_accounts and (membership.projection_revision != 0 or space_owned):
membership.status = MembershipStatus.REMOVED.value
membership.projection_revision = max(
int(membership.projection_revision),