hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-17 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add get_api_pagination method to base handler, revert group.users pagination

Browse Source
This commit is contained in:
Nathan Barber
2021-04-21 09:57:30 -04:00
parent 5d095c0234
commit ab130309ec
5 changed files with 24 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
jupyterhub/apihandlers/groups.py
View File

@@ -38,34 +38,9 @@ class GroupListAPIHandler(_GroupAPIHandler):
@admin_only
def get(self):
"""List groups"""
offset = self.get_argument("offset", None)
limit = self.get_argument("limit", self.settings['app'].api_page_default_limit)
max_limit = self.settings['app'].api_page_max_limit
query = self.db.query(orm.Group)
if offset is not None:
try:
offset = int(offset)
except Exception as e:
raise web.HTTPError(
400, "Invalid argument type, offset must be an integer"
)
query = query.offset(offset)
if limit != self.settings['app'].api_page_default_limit:
try:
limit = int(limit)
if limit > max_limit:
limit = max_limit
except Exception as e:
raise web.HTTPError(
400, "Invalid argument type, limit must be an integer"
)
query = query.limit(limit)
offset, limit = self.get_api_pagination()
query = query.offset(offset).limit(limit)
data = [self.group_model(group) for group in query]
self.write(json.dumps(data))
@@ -104,36 +79,8 @@ class GroupAPIHandler(_GroupAPIHandler):
@admin_only
def get(self, name):
offset = self.get_argument("offset", None)
limit = self.get_argument("limit", self.settings['app'].api_page_default_limit)
max_limit = self.settings['app'].api_page_max_limit
group = self.find_group(name)
if offset is not None:
try:
offset = int(offset)
except Exception as e:
raise web.HTTPError(
400, "Invalid argument type, offset must be an integer"
)
group.users = group.users[offset:]
if limit != self.settings['app'].api_page_default_limit:
try:
limit = int(limit)
if limit > max_limit:
limit = max_limit
except Exception as e:
raise web.HTTPError(
400, "Invalid argument type, limit must be an integer"
)
group.users = group.users[:limit]
group_model = self.group_model(group)
self.write(json.dumps(group_model))
@admin_only