Skip to content

feat(BA-5299): Add SessionV2GQL to EntityNode union and resolve SESSION in RBAC entity resolvers #10320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fregataa merged 5 commits into from
Mar 20, 2026
Merged

feat(BA-5299): Add SessionV2GQL to EntityNode union and resolve SESSION in RBAC entity resolvers #10320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c8a662
feat(BA-5299): Add SessionV2GQL to EntityNode union
fregataa Mar 19, 2026
7c5fb8c
feat(BA-5299): Add SESSION resolver to EntityRefGQL.entity
fregataa Mar 19, 2026
0d991e6
feat(BA-5299): Add SESSION resolver to PermissionGQL.scope
fregataa Mar 19, 2026
f3c4001
changelog: add news fragment for PR #10320
fregataa Mar 19, 2026
b16950e
chore: update api schema dump
fregataa Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/10320.feature.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support resolving session entities in RBAC entity and permission scope queries
3 changes: 2 additions & 1 deletion docs/manager/graphql-reference/supergraph.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4639,6 +4639,7 @@ union EntityNode
@join__unionMember(graph: STRAWBERRY, member: "VirtualFolderNode")
@join__unionMember(graph: STRAWBERRY, member: "ImageV2")
@join__unionMember(graph: STRAWBERRY, member: "ComputeSessionNode")
@join__unionMember(graph: STRAWBERRY, member: "SessionV2")
@join__unionMember(graph: STRAWBERRY, member: "Artifact")
@join__unionMember(graph: STRAWBERRY, member: "ArtifactRegistry")
@join__unionMember(graph: STRAWBERRY, member: "AppConfig")
Expand All @@ -4649,7 +4650,7 @@ union EntityNode
@join__unionMember(graph: STRAWBERRY, member: "ContainerRegistryV2")
@join__unionMember(graph: STRAWBERRY, member: "ArtifactRevision")
@join__unionMember(graph: STRAWBERRY, member: "Role")
= UserV2 | ProjectV2 | DomainV2 | VirtualFolderNode | ImageV2 | ComputeSessionNode | Artifact | ArtifactRegistry | AppConfig | NotificationChannel | NotificationRule | ModelDeployment | ResourceGroup | ContainerRegistryV2 | ArtifactRevision | Role
= UserV2 | ProjectV2 | DomainV2 | VirtualFolderNode | ImageV2 | ComputeSessionNode | SessionV2 | Artifact | ArtifactRegistry | AppConfig | NotificationChannel | NotificationRule | ModelDeployment | ResourceGroup | ContainerRegistryV2 | ArtifactRevision | Role

"""Added in 26.3.0. Order by specification for entity associations"""
input EntityOrderBy
Expand Down
2 changes: 1 addition & 1 deletion docs/manager/graphql-reference/v2-schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2677,7 +2677,7 @@ input EntityFilter {
NOT: [EntityFilter!] = null
}

union EntityNode = UserV2 | ProjectV2 | DomainV2 | VirtualFolderNode | ImageV2 | ComputeSessionNode | Artifact | ArtifactRegistry | AppConfig | NotificationChannel | NotificationRule | ModelDeployment | ResourceGroup | ContainerRegistryV2 | ArtifactRevision | Role
union EntityNode = UserV2 | ProjectV2 | DomainV2 | VirtualFolderNode | ImageV2 | ComputeSessionNode | SessionV2 | Artifact | ArtifactRegistry | AppConfig | NotificationChannel | NotificationRule | ModelDeployment | ResourceGroup | ContainerRegistryV2 | ArtifactRevision | Role

"""Added in 26.3.0. Order by specification for entity associations"""
input EntityOrderBy {
Expand Down
13 changes: 10 additions & 3 deletions src/ai/backend/manager/api/gql/rbac/types/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async def entity(
*,
info: Info[StrawberryGQLContext],
) -> EntityNode | None:
from ai.backend.common.types import ImageID
from ai.backend.common.types import ImageID, SessionId
from ai.backend.manager.api.gql.artifact.types import ArtifactRevision
from ai.backend.manager.api.gql.container_registry.types import ContainerRegistryGQL
from ai.backend.manager.api.gql.deployment.types.deployment import ModelDeployment
Expand All @@ -76,6 +76,7 @@ async def entity(
from ai.backend.manager.api.gql.project_v2.types.node import ProjectV2GQL
from ai.backend.manager.api.gql.rbac.types.role import RoleGQL
from ai.backend.manager.api.gql.resource_group.types import ResourceGroupGQL
from ai.backend.manager.api.gql.session.types import SessionV2GQL
from ai.backend.manager.api.gql.user.types.node import UserV2GQL

element_type = self.entity_type.to_element()
Expand Down Expand Up @@ -146,9 +147,15 @@ async def entity(
if cr_data is None:
return None
return ContainerRegistryGQL.from_data(cr_data)
case RBACElementType.SESSION:
session_data = await data_loaders.session_loader.load(
SessionId(uuid.UUID(self.entity_id))
)
if session_data is None:
return None
return SessionV2GQL.from_data(session_data)
case (
RBACElementType.SESSION
| RBACElementType.VFOLDER
RBACElementType.VFOLDER
| RBACElementType.KEYPAIR
| RBACElementType.NETWORK
| RBACElementType.STORAGE_HOST
Expand Down
2 changes: 2 additions & 0 deletions src/ai/backend/manager/api/gql/rbac/types/entity_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from ai.backend.manager.api.gql.project_v2.types.node import ProjectV2GQL
from ai.backend.manager.api.gql.rbac.types.role import RoleGQL
from ai.backend.manager.api.gql.resource_group.types import ResourceGroupGQL
from ai.backend.manager.api.gql.session.types import SessionV2GQL
from ai.backend.manager.api.gql.session_federation import Session
from ai.backend.manager.api.gql.user.types.node import UserV2GQL
from ai.backend.manager.api.gql.vfolder import VFolder
Expand All @@ -39,6 +40,7 @@
| VFolder
| ImageV2GQL
| Session
| SessionV2GQL
| Artifact
| ArtifactRegistry
| AppConfig
Expand Down
12 changes: 10 additions & 2 deletions src/ai/backend/manager/api/gql/rbac/types/permission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
OperationType,
RBACElementType,
)
from ai.backend.common.types import SessionId
from ai.backend.manager.api.gql.base import OrderDirection
from ai.backend.manager.api.gql.rbac.types.entity_node import EntityNode
from ai.backend.manager.api.gql.types import GQLFilter, GQLOrderBy, StrawberryGQLContext
Expand Down Expand Up @@ -194,6 +195,7 @@ async def scope(
from ai.backend.manager.api.gql.project_v2.types.node import ProjectV2GQL
from ai.backend.manager.api.gql.rbac.types.role import RoleGQL
from ai.backend.manager.api.gql.resource_group.types import ResourceGroupGQL
from ai.backend.manager.api.gql.session.types import SessionV2GQL
from ai.backend.manager.api.gql.user.types.node import UserV2GQL

element_type = self.scope_type.to_element()
Expand Down Expand Up @@ -243,9 +245,15 @@ async def scope(
if cr_data is None:
return None
return ContainerRegistryGQL.from_data(cr_data)
case RBACElementType.SESSION:
session_data = await data_loaders.session_loader.load(
SessionId(uuid.UUID(self.scope_id))
)
if session_data is None:
return None
return SessionV2GQL.from_data(session_data)
Comment thread
fregataa marked this conversation as resolved.
case (
RBACElementType.SESSION
| RBACElementType.VFOLDER
RBACElementType.VFOLDER
| RBACElementType.KEYPAIR
| RBACElementType.NOTIFICATION_CHANNEL
| RBACElementType.NETWORK
Expand Down
Loading