refactor: Add users_to_add and users_to_remove fields to replace user update mode

src/ai/backend/manager/models/gql.py

@@ -52,7 +52,15 @@
 from .base import DataLoaderManager, privileged_query, scoped_query
 from .domain import CreateDomain, DeleteDomain, Domain, ModifyDomain, PurgeDomain
 from .endpoint import Endpoint, EndpointList, EndpointToken, EndpointTokenList
-from .group import CreateGroup, DeleteGroup, Group, ModifyGroup, PurgeGroup
+from .group import (
+    AddUserToGroup,
+    CreateGroup,
+    DeleteGroup,
+    DeleteUserFromGroup,
+    Group,
+    ModifyGroup,
+    PurgeGroup,
+)
 from .image import (
     AliasImage,
     ClearImages,
@@ -170,6 +178,8 @@ class Mutations(graphene.ObjectType):
     modify_group = ModifyGroup.Field()
     delete_group = DeleteGroup.Field()
     purge_group = PurgeGroup.Field()
+    add_user_to_group = AddUserToGroup.Field()
+    delete_user_from_group = DeleteUserFromGroup.Field()
 
     # super-admin only
     create_user = CreateUser.Field()

src/ai/backend/manager/models/group.py

@@ -393,13 +393,40 @@ class ModifyGroupInput(graphene.InputObjectType):
     is_active = graphene.Boolean(required=False)
     domain_name = graphene.String(required=False)
     total_resource_slots = graphene.JSONString(required=False)
-    user_update_mode = graphene.String(required=False)
-    user_uuids = graphene.List(lambda: graphene.String, required=False)
+    user_update_mode = graphene.String(
+        deprecation_reason=(
+            "Deprecated since 24.03.0. Recommend to use AddUsersToGroup, DeleteUsersFromGroup"
+            " mutation"
+        )
+    )
+    user_uuids = graphene.List(
+        lambda: graphene.String,
+        deprecation_reason=(
+            "Deprecated since 24.03.0. Recommend to use AddUsersToGroup, DeleteUsersFromGroup"
+            " mutation"
+        ),
+    )
     allowed_vfolder_hosts = graphene.JSONString(required=False)
     integration_id = graphene.String(required=False)
     resource_policy = graphene.String(required=False)
 
 
+class AddUsersToGroupInput(graphene.InputObjectType):
+    user_ids = graphene.List(
+        lambda: graphene.String,
+        required=True,
+        description="Added since 24.03.0. ID array of the users to be added to the group.",
+    )
+
+
+class DeleteUsersFromGroupInput(graphene.InputObjectType):
+    user_ids = graphene.List(
+        lambda: graphene.String,
+        required=True,
+        description="Added since 24.03.0. ID array of the users to be deleted from the group.",
+    )
+
+
 class CreateGroup(graphene.Mutation):
     allowed_roles = (UserRole.ADMIN, UserRole.SUPERADMIN)
 
@@ -496,8 +523,6 @@ async def mutate(
 
         async def _do_mutate() -> ModifyGroup:
             async with graph_ctx.db.begin() as conn:
-                # TODO: refactor user addition/removal in groups as separate mutations
-                #       (to apply since 21.09)
                 if props.user_update_mode == "add":
                     values = [{"user_id": uuid, "group_id": gid} for uuid in props.user_uuids]
                     await conn.execute(
@@ -531,6 +556,73 @@ async def _do_mutate() -> ModifyGroup:
             return cls(ok=False, msg=f"unexpected error: {e}", group=None)
 
 
+class AddUserToGroup(graphene.Mutation):
+    allowed_roles = (UserRole.ADMIN, UserRole.SUPERADMIN)
+
+    class Arguments:
+        gid = graphene.UUID(required=True)
+        props = AddUsersToGroupInput(required=True)
+
+    ok = graphene.Boolean()
+    msg = graphene.String()
+
+    @classmethod
+    async def mutate(
+        cls,
+        root,
+        info: graphene.ResolveInfo,
+        gid: uuid.UUID,
+        props: AddUsersToGroupInput,
+    ) -> AddUserToGroup:
+        graph_ctx: GraphQueryContext = info.context
+        data: dict[str, Any] = {}
+        set_if_set(props, data, "user_ids")
+        if not props.user_ids:
+            return cls(ok=False, msg="empty user id array")
+
+        insert_query = sa.insert(AssocGroupUserRow).values(
+            [
+                {
+                    "user_id": uuid.UUID(uid),
+                    "group_id": gid,
+                }
+                for uid in props.user_ids
+            ]
+        )
+        return await simple_db_mutate_returning_item(cls, graph_ctx, insert_query, item_cls=Group)
+
+
+class DeleteUserFromGroup(graphene.Mutation):
+    allowed_roles = (UserRole.ADMIN, UserRole.SUPERADMIN)
+
+    class Arguments:
+        gid = graphene.UUID(required=True)
+        props = DeleteUsersFromGroupInput(required=True)
+
+    ok = graphene.Boolean()
+    msg = graphene.String()
+
+    @classmethod
+    async def mutate(
+        cls,
+        root,
+        info: graphene.ResolveInfo,
+        gid: uuid.UUID,
+        props: DeleteUsersFromGroupInput,
+    ) -> DeleteUserFromGroup:
+        graph_ctx: GraphQueryContext = info.context
+        data: dict[str, Any] = {}
+        set_if_set(props, data, "user_ids")
+        if not props.user_ids:
+            return cls(ok=False, msg="empty user id array")
+
+        delete_query = sa.insert(AssocGroupUserRow).where(
+            (AssocGroupUserRow.group_id == gid)
+            & (AssocGroupUserRow.user_id.in_([uuid.UUID(uid) for uid in props.user_ids]))
+        )
+        return await simple_db_mutate_returning_item(cls, graph_ctx, delete_query, item_cls=Group)
+
+
 class DeleteGroup(graphene.Mutation):
     """
     Instead of deleting the group, just mark it as inactive.

src/ai/backend/manager/models/resource_policy.py

@@ -28,7 +28,6 @@
 )
 from .keypair import keypairs
 from .user import UserRole
-from .utils import deprecation_reason_msg, description_msg
 
 if TYPE_CHECKING:
     from .gql import GraphQueryContext
@@ -58,34 +57,6 @@
 )
 
 
-def user_max_vfolder_count(required: bool = False):
-    return graphene.Int(
-        required=required,
-        description=description_msg("24.03.1", "Limitation of the number of user vfolders."),
-    )
-
-
-def user_max_quota_scope_size(required: bool = False):
-    return BigInt(
-        required=required,
-        description=description_msg("24.03.1", "Limitation of the quota size of user vfolders."),
-    )
-
-
-def project_max_vfolder_count(required: bool = False):
-    return graphene.Int(
-        required=required,
-        description=description_msg("24.03.1", "Limitation of the number of project vfolders."),
-    )
-
-
-def project_max_quota_scope_size(required: bool = False):
-    return BigInt(
-        required=required,
-        description=description_msg("24.03.1", "Limitation of the quota size of project vfolders."),
-    )
-
-
 keypair_resource_policies = sa.Table(
     "keypair_resource_policies",
     mapper_registry.metadata,
@@ -172,9 +143,9 @@ class KeyPairResourcePolicy(graphene.ObjectType):
     idle_timeout = BigInt()
     allowed_vfolder_hosts = graphene.JSONString()
 
-    max_vfolder_count = graphene.Int(deprecation_reason=deprecation_reason_msg("23.09.4"))
-    max_vfolder_size = BigInt(deprecation_reason=deprecation_reason_msg("23.09.4"))
-    max_quota_scope_size = BigInt(deprecation_reason=deprecation_reason_msg("23.09.4"))
+    max_vfolder_count = graphene.Int(deprecation_reason="Deprecated since 23.09.4")
+    max_vfolder_size = BigInt(deprecation_reason="Deprecated since 23.09.4")
+    max_quota_scope_size = BigInt(deprecation_reason="Deprecated since 23.09.4")
 
     @classmethod
     def from_row(
@@ -326,15 +297,15 @@ class CreateKeyPairResourcePolicyInput(graphene.InputObjectType):
     allowed_vfolder_hosts = graphene.JSONString(required=False)
     max_vfolder_count = graphene.Int(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
     max_vfolder_size = BigInt(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
     max_quota_scope_size = BigInt(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
 
 
@@ -349,15 +320,15 @@ class ModifyKeyPairResourcePolicyInput(graphene.InputObjectType):
     allowed_vfolder_hosts = graphene.JSONString(required=False)
     max_vfolder_count = graphene.Int(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
     max_vfolder_size = BigInt(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
     max_quota_scope_size = BigInt(
         required=False,
-        deprecation_reason=deprecation_reason_msg("23.09.4"),
+        deprecation_reason="Deprecated since 23.09.4",
     )
 
 
@@ -471,9 +442,15 @@ class UserResourcePolicy(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
     created_at = GQLDateTime(required=True)
-    max_vfolder_count = user_max_vfolder_count()
-    max_quota_scope_size = user_max_quota_scope_size()
-    max_vfolder_size = BigInt(deprecation_reason=deprecation_reason_msg("23.09.1"))
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of user vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of user vfolders.",
+    )
+    max_vfolder_size = BigInt(deprecation_reason="Deprecated since 23.09.1")
 
     @classmethod
     def from_row(
@@ -545,13 +522,25 @@ async def batch_load_by_user(
 
 
 class CreateUserResourcePolicyInput(graphene.InputObjectType):
-    max_vfolder_count = user_max_vfolder_count()
-    max_quota_scope_size = user_max_quota_scope_size()
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of user vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of user vfolders.",
+    )
 
 
 class ModifyUserResourcePolicyInput(graphene.InputObjectType):
-    max_vfolder_count = user_max_vfolder_count()
-    max_quota_scope_size = user_max_quota_scope_size()
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of user vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of user vfolders.",
+    )
 
 
 class CreateUserResourcePolicy(graphene.Mutation):
@@ -648,9 +637,15 @@ class ProjectResourcePolicy(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
     created_at = GQLDateTime(required=True)
-    max_vfolder_count = project_max_vfolder_count()
-    max_quota_scope_size = project_max_quota_scope_size()
-    max_vfolder_size = BigInt(deprecation_reason=deprecation_reason_msg("23.09.1"))
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of project vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of project vfolders.",
+    )
+    max_vfolder_size = BigInt(deprecation_reason="Deprecated since 23.09.1")
 
     @classmethod
     def from_row(
@@ -723,13 +718,25 @@ async def batch_load_by_project(
 
 
 class CreateProjectResourcePolicyInput(graphene.InputObjectType):
-    max_vfolder_count = project_max_vfolder_count()
-    max_quota_scope_size = project_max_quota_scope_size()
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of project vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of project vfolders.",
+    )
 
 
 class ModifyProjectResourcePolicyInput(graphene.InputObjectType):
-    max_vfolder_count = project_max_vfolder_count()
-    max_quota_scope_size = project_max_quota_scope_size()
+    max_vfolder_count = graphene.Int(
+        required=False,
+        description="Added since 24.03.1. Limitation of the number of project vfolders.",
+    )
+    max_quota_scope_size = BigInt(
+        required=False,
+        description="Added since 24.03.1. Limitation of the quota size of project vfolders.",
+    )
 
 
 class CreateProjectResourcePolicy(graphene.Mutation):

src/ai/backend/manager/models/utils.py

@@ -362,17 +362,3 @@ def agg_to_array(column: sa.Column) -> sa.sql.functions.Function:
 
 def is_db_retry_error(e: Exception) -> bool:
     return isinstance(e, DBAPIError) and getattr(e.orig, "pgcode", None) == "40001"
-
-
-def description_msg(version: str, detail: str | None = None) -> str:
-    val = f"Added since {version}."
-    if detail:
-        val = f"{val} {detail}"
-    return val
-
-
-def deprecation_reason_msg(version: str, detail: str | None = None) -> str:
-    val = f"Deprecated since {version}."
-    if detail:
-        val = f"{val} {detail}"
-    return val