Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

feat(admin): allow deleting nonempty user groups (#6282)

dingben2718f9657882
diff --git a/docs/en/api/08-admin.md b/docs/en/api/08-admin.md
index 1a26c4944..048fb90ee 100644
--- a/docs/en/api/08-admin.md
+++ b/docs/en/api/08-admin.md
@@ -59,13 +59,13 @@ Configure `root_api_key` in `~/.openviking/ovcli.conf`:
A group belongs to one account and lets one ACL principal grant access to multiple users. Its caller-supplied `group_id` follows the same identifier rules as `user_id` and is the account-unique, stable identifier; there is no separate group name. Only existing users from the same account can be members, and groups cannot be nested.
-The server adds memberships to `RequestContext.group_ids` for each request. Adding or removing a member takes effect on the next request without rewriting resource ACL or context records. Removing a user also removes all memberships. A group must be empty before deletion.
+The server adds memberships to `RequestContext.group_ids` for each request. Adding or removing a member takes effect on the next request without rewriting resource ACL or context records. Removing a user also removes all memberships. Groups can be deleted whether empty or non-empty. Deleting a group removes all its memberships, preserves users and their credentials, and does not rewrite resource ACL or context records.
| Method | Path | Description |
|--------|------|-------------|
| POST | `/api/v1/admin/accounts/{account_id}/groups` | Create an empty group with `{"group_id":"engineering"}` |
| GET | `/api/v1/admin/accounts/{account_id}/groups` | List groups |
-| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}` | Delete an empty group |
+| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}` | Delete a group and all its memberships, including when the group is non-empty |
| GET | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members` | List members |
| PUT | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members/{user_id}` | Add a member idempotently; repeated calls return `added=true` |
| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members/{user_id}` | Remove a member; repeated calls return `removed=false` |
@@ -79,6 +79,8 @@ ov --sudo admin remove-group-member acme engineering alice
ov --sudo admin delete-group acme engineering
```
+To delete a group that still has members, call `DELETE /api/v1/admin/accounts/acme/groups/engineering`.
+
The Python SDK exposes `admin_create_group`, `admin_list_groups`, `admin_list_group_members`, `admin_add_group_member`, `admin_remove_group_member`, and `admin_delete_group`. The Go SDK uses matching PascalCase method names.
## API Reference
diff --git a/docs/zh/api/08-admin.md b/docs/zh/api/08-admin.md
index 2849d5bee..3e3d22248 100644
--- a/docs/zh/api/08-admin.md
+++ b/docs/zh/api/08-admin.md
@@ -59,13 +59,13 @@ Admin API 用于多租户环境下的账户、用户和用户组管理。包括
用户组属于单个 account,用于通过一个 ACL principal 授权多个用户。`group_id` 由调用者创建时指定,使用与 `user_id` 相同的标识符规则,是 account 内唯一且稳定的标识;不存在单独的组名。组内只能加入当前 account 已存在的用户,不支持嵌套组。
-成员关系由服务端加入每次请求的 `RequestContext.group_ids`。添加或移除成员从下一次请求开始生效,不重写资源 ACL 或 context 记录。用户被删除时会自动退出所有组;用户组必须为空才能删除。
+成员关系由服务端加入每次请求的 `RequestContext.group_ids`。添加或移除成员从下一次请求开始生效,不重写资源 ACL 或 context 记录。用户被删除时会自动退出所有组。无论组是否为空,都可以直接删除;删除组会移除该组的全部成员关系,保留用户及其凭证,也不重写资源 ACL 或 context 记录。
| 方法 | 路径 | 说明 |
|------|------|------|
| POST | `/api/v1/admin/accounts/{account_id}/groups` | 创建空组,请求体为 `{"group_id":"engineering"}` |
| GET | `/api/v1/admin/accounts/{account_id}/groups` | 列出组 |
-| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}` | 删除空组 |
+| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}` | 删除组及其全部成员关系,允许组内仍有成员 |
| GET | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members` | 列出成员 |
| PUT | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members/{user_id}` | 幂等添加成员;重复调用返回 `added=true` |
| DELETE | `/api/v1/admin/accounts/{account_id}/groups/{group_id}/members/{user_id}` | 移除成员;重复调用返回 `removed=false` |
@@ -79,6 +79,8 @@ ov --sudo admin remove-group-member acme engineering alice
ov --sudo admin delete-group acme engineering
```
+要直接删除仍有成员的组,可调用 `DELETE /api/v1/admin/accounts/acme/groups/engineering`。
+
Python SDK 提供对应的 `admin_create_group`、`admin_list_groups`、`admin_list_group_members`、`admin_add_group_member`、`admin_remove_group_member` 和 `admin_delete_group`;Go SDK 使用相同名称的 PascalCase 方法。
## API 参考
diff --git a/openviking/server/account_stores/mysql.py b/openviking/server/account_stores/mysql.py
index 142ba68ad..bab71d9cd 100644
--- a/openviking/server/account_stores/mysql.py
+++ b/openviking/server/account_stores/mysql.py
@@ -1147,16 +1147,7 @@ class MySQLAccountStore(AccountStore):
)
if group is None:
raise NotFoundError(group_id, "group")
- if await session.scalar(
- select(func.count())
- .select_from(GroupMember)
- .where(
- GroupMember.service_name == self._service_name,
- GroupMember.account_pk == account.account_pk,
- GroupMember.group_pk == group.group_pk,
- )
- ):
- raise FailedPreconditionError("Group must be empty before deletion")
+ # The membership foreign key cascades deletion without removing users.
await session.delete(group)
async def replace_active_user_api_key(
diff --git a/openviking/server/account_stores/redis_mysql.py b/openviking/server/account_stores/redis_mysql.py
index fbf2f70ce..d830a3091 100644
--- a/openviking/server/account_stores/redis_mysql.py
+++ b/openviking/server/account_stores/redis_mysql.py
@@ -865,6 +865,8 @@ class RedisMySQLAccountStore(AccountStore):
account_id,
lambda: self._mysql.delete_group(account_id, group_id),
lambda: (),
+ # Clear all member caches, including memberships added concurrently.
+ account_wide=True,
)
async def ensure_trusted_identities(self, identities: dict[str, set[str]]) -> dict[str, int]:
diff --git a/openviking/server/api_keys/legacy.py b/openviking/server/api_keys/legacy.py
index a18647458..112b844fc 100644
--- a/openviking/server/api_keys/legacy.py
+++ b/openviking/server/api_keys/legacy.py
@@ -1133,9 +1133,7 @@ class FileStore(AccountStore):
async with self._reload_lock:
account = self._require_account(account_id)
await self._load_account_groups_if_needed(account_id, account)
- group = self._require_group(account_id, group_id)
- if group.get("members"):
- raise FailedPreconditionError("Group must be empty before deletion")
+ self._require_group(account_id, group_id)
groups = copy.deepcopy(account.groups)
del groups[group_id]
await self._replace_groups(account_id, account, groups)
diff --git a/tests/server/test_account_services.py b/tests/server/test_account_services.py
index 447ec7bac..c7a4c24a7 100644
--- a/tests/server/test_account_services.py
+++ b/tests/server/test_account_services.py
@@ -12,13 +12,12 @@ import pytest
from sqlalchemy import delete, func, select
from sqlalchemy.ext.asyncio import create_async_engine
-from openviking.server.account_stores.mysql_schema import Account, Base, Credential
+from openviking.server.account_stores.mysql_schema import Account, Base, Credential, GroupMember
from openviking.server.api_keys import APIKeyManager
from openviking.server.api_keys.legacy import FileStore
from openviking.server.identity import Role
from openviking.server.store_assembly import build_api_key_manager
from openviking_cli.exceptions import (
- FailedPreconditionError,
InvalidArgumentError,
NotFoundError,
UnauthenticatedError,
@@ -240,8 +239,8 @@ async def test_regenerate_key_preserves_management_not_found_errors():
await manager.regenerate_key("acme", "missing")
-async def test_distributed_credentials_are_shared_and_service_scoped():
- """Warm caches must reject rotated keys without crossing service boundaries."""
+async def test_distributed_authentication_state_is_shared_and_service_scoped():
+ """Key rotation and group deletion refresh caches within the owning service."""
raw_mysql = os.environ.get("OV_TEST_MYSQL")
redis_url = os.environ.get("OV_TEST_REDIS")
if not raw_mysql or not redis_url:
@@ -305,9 +304,25 @@ async def test_distributed_credentials_are_shared_and_service_scoped():
active_key = await writer.regenerate_key("acme", "alice")
with pytest.raises(UnauthenticatedError):
await reader.resolve_identity(old_key)
+ await writer.create_group("acme", "engineering")
+ await writer.add_group_member("acme", "engineering", "alice")
+ assert await reader.get_user_group_ids("acme", "alice") == ("engineering",)
+
+ await writer.delete_group("acme", "engineering")
+
+ assert await reader.get_groups("acme") == []
+ assert await reader.get_user_group_ids("acme", "alice") == ()
assert (await reader.resolve_identity(active_key)).user_id == "alice"
assert (await isolated.resolve_identity(isolated_key)).role == Role.ADMIN
async with engine.connect() as connection:
+ assert (
+ await connection.scalar(
+ select(func.count())
+ .select_from(GroupMember)
+ .where(GroupMember.service_name == service_name)
+ )
+ == 0
+ )
assert (
await connection.scalar(
select(func.count())
@@ -410,13 +425,38 @@ async def test_file_user_deletion_fence_survives_concurrent_role_update():
assert (await store.get_deletion("acme", "bob"))["task_id"] == "delete"
-async def test_file_store_rejects_deleting_nonempty_group():
- store = _file_store()
- await store.load()
- await store.create_account_with_api_key("acme", "alice", "alice-key")
- await store.create_group("acme", "engineering")
- await store.add_group_member("acme", "engineering", "alice")
+async def test_group_deletion_preserves_users_and_persists_membership_removal():
+ fs = SimpleNamespace(agfs=InMemoryAGFS())
+ manager = build_api_key_manager("root", fs)
+ reloaded = build_api_key_manager("root", fs)
+ await manager.load()
+ try:
+ alice_key = await manager.create_account("acme", "alice")
+ bob_key = await manager.register_user("acme", "bob")
+ await manager.create_group("acme", "engineering")
+ await manager.create_group("acme", "reviewers")
+ await manager.add_group_member("acme", "engineering", "alice")
+ await manager.add_group_member("acme", "engineering", "bob")
+ await manager.add_group_member("acme", "reviewers", "bob")
+ assert await manager.get_user_group_ids("acme", "bob") == (
+ "engineering",
+ "reviewers",
+ )
- with pytest.raises(FailedPreconditionError, match="Group must be empty"):
- await store.delete_group("acme", "engineering")
- assert await store.get_group_members("acme", "engineering") == ["alice"]
+ await manager.delete_group("acme", "engineering")
+ await reloaded.load()
+
+ for reader in (manager, reloaded):
+ assert await reader.get_groups("acme") == [{"group_id": "reviewers", "member_count": 1}]
+ assert await reader.get_user_group_ids("acme", "alice") == ()
+ assert await reader.get_user_group_ids("acme", "bob") == ("reviewers",)
+ assert (await reader.resolve_identity(alice_key)).user_id == "alice"
+ assert (await reader.resolve_identity(bob_key)).user_id == "bob"
+ with pytest.raises(NotFoundError, match="Group not found"):
+ await reader.get_group_members("acme", "engineering")
+
+ with pytest.raises(NotFoundError, match="Group not found"):
+ await manager.delete_group("acme", "engineering")
+ finally:
+ await reloaded.close()
+ await manager.close()