diff --git a/src/ai/backend/manager/models/gql.py b/src/ai/backend/manager/models/gql.py index 6c2a8560c2..0cefb9b6d0 100644 --- a/src/ai/backend/manager/models/gql.py +++ b/src/ai/backend/manager/models/gql.py @@ -118,7 +118,7 @@ LegacyComputeSessionList, ) from .keypair import CreateKeyPair, DeleteKeyPair, KeyPair, KeyPairList, ModifyKeyPair -from .rbac import ScopeField, ScopeType +from .rbac import ScopeField, ScopeType, SystemScope from .rbac.permission_defs import ComputeSessionPermission, DomainPermission from .rbac.permission_defs import VFolderPermission as VFolderRBACPermission from .resource_policy import ( @@ -389,7 +389,7 @@ class Queries(graphene.ObjectType): domain_nodes = PaginatedConnectionField( DomainConnection, description="Added in 24.12.0.", - scope=ScopeField(required=True), + scope=ScopeField(), filter=graphene.String(), order=graphene.String(), permission=DomainPermissionValueField( @@ -989,7 +989,7 @@ async def resolve_domain_nodes( root: Any, info: graphene.ResolveInfo, *, - scope: ScopeType, + scope: Optional[ScopeType] = None, permission: DomainPermission, filter: Optional[str] = None, order: Optional[str] = None, @@ -998,6 +998,8 @@ async def resolve_domain_nodes( before: Optional[str] = None, last: Optional[int] = None, ) -> ConnectionResolverResult[DomainNode]: + if scope is None: + scope = SystemScope() return await DomainNode.get_connection( info, scope, diff --git a/src/ai/backend/manager/models/gql_models/domain.py b/src/ai/backend/manager/models/gql_models/domain.py index 90a1162bc0..befc431641 100644 --- a/src/ai/backend/manager/models/gql_models/domain.py +++ b/src/ai/backend/manager/models/gql_models/domain.py @@ -84,8 +84,8 @@ def parse_value(value: str) -> DomainPermission: "row_id": ("id", None), "name": ("name", None), "is_active": ("is_active", None), - "created_at": ("created_at", dtparse), - "modified_at": ("modified_at", dtparse), + "created_at": ("created_at", None), + "modified_at": ("modified_at", None), }