Skip to content

Commit

Permalink
feat: enable filter order in endpoint model (#2723) (#2752)
Browse files Browse the repository at this point in the history
Co-authored-by: HYUNMIN CHO <48516380+ggstargame45@users.noreply.github.com>
Co-authored-by: Kyujin Cho <kyujin.cho@lablup.com>
  • Loading branch information
3 people authored Aug 23, 2024
1 parent 3b68ae0 commit aae2d11
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 17 deletions.
1 change: 1 addition & 0 deletions changes/2723.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow filter and order in endpointlist gql request.
55 changes: 38 additions & 17 deletions src/ai/backend/manager/models/endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
gql_mutation_wrapper,
)
from .image import ImageNode, ImageRefType, ImageRow
from .minilang.ordering import OrderSpecItem, QueryOrderParser
from .minilang.queryfilter import FieldSpecItem, QueryFilterParser
from .resource_policy import keypair_resource_policies
from .routing import RouteStatus, Routing
from .scaling_group import scaling_groups
Expand Down Expand Up @@ -832,10 +834,27 @@ async def load_count(
result = await conn.execute(query)
return result.scalar()

_queryfilter_fieldspec: Mapping[str, FieldSpecItem] = {
"name": ("endpoints_name", None),
"model": ("endpoints_model", None),
"domain": ("endpoints_domain", None),
"url": ("endpoints_url", None),
"created_user_email": ("users_email", None),
}

_queryorder_colmap: Mapping[str, OrderSpecItem] = {
"name": ("endpoints_name", None),
"created_at": ("endpoints_created_at", None),
"model": ("endpoints_model", None),
"domain": ("endpoints_domain", None),
"url": ("endpoints_url", None),
"created_user_email": ("users_email", None),
}

@classmethod
async def load_slice(
cls,
ctx, # ctx: GraphQueryContext,
ctx, #: GraphQueryContext, # ctx: GraphQueryContext,
limit: int,
offset: int,
*,
Expand All @@ -847,36 +866,38 @@ async def load_slice(
) -> Sequence["Endpoint"]:
query = (
sa.select(EndpointRow)
.select_from(
sa.join(
EndpointRow,
UserRow,
EndpointRow.created_user == UserRow.uuid,
isouter=True,
)
)
.limit(limit)
.offset(offset)
.options(selectinload(EndpointRow.image_row).selectinload(ImageRow.aliases))
.options(selectinload(EndpointRow.routings))
.options(selectinload(EndpointRow.created_user_row))
.options(selectinload(EndpointRow.session_owner_row))
.order_by(sa.desc(EndpointRow.created_at))
.filter(
EndpointRow.lifecycle_stage.in_([
EndpointLifecycle.CREATED,
EndpointLifecycle.DESTROYING,
])
)
)
if project is not None:
query = query.where(EndpointRow.project == project)
if domain_name is not None:
query = query.where(EndpointRow.domain == domain_name)
if user_uuid is not None:
query = query.where(EndpointRow.session_owner == user_uuid)
"""

if filter is not None:
parser = QueryFilterParser(cls._queryfilter_fieldspec)
query = parser.append_filter(query, filter)
filter_parser = QueryFilterParser(cls._queryfilter_fieldspec)
query = filter_parser.append_filter(query, filter)
if order is not None:
parser = QueryOrderParser(cls._queryorder_colmap)
query = parser.append_ordering(query, order)
"""
async with ctx.db.begin_readonly_session() as session:
result = await session.execute(query)
order_parser = QueryOrderParser(cls._queryorder_colmap)
query = order_parser.append_ordering(query, order)
else:
query = query.order_by(sa.desc(EndpointRow.created_at))

async with ctx.db.begin_readonly_session() as db_session:
result = await db_session.execute(query)
return [await cls.from_row(ctx, row) for row in result.scalars().all()]

@classmethod
Expand Down

0 comments on commit aae2d11

Please sign in to comment.