|
28 | 28 | from .base_session_service import BaseSessionService |
29 | 29 | from .base_session_service import GetSessionConfig |
30 | 30 | from .base_session_service import ListSessionsResponse |
| 31 | +from .base_session_service import _decode_page_token |
| 32 | +from .base_session_service import _encode_page_token |
| 33 | +from .base_session_service import _resolve_page_size |
31 | 34 | from .session import Session |
32 | 35 | from .state import State |
33 | 36 |
|
@@ -220,42 +223,86 @@ def _merge_state( |
220 | 223 |
|
221 | 224 | @override |
222 | 225 | async def list_sessions( |
223 | | - self, *, app_name: str, user_id: Optional[str] = None |
| 226 | + self, |
| 227 | + *, |
| 228 | + app_name: str, |
| 229 | + user_id: Optional[str] = None, |
| 230 | + page_size: Optional[int] = None, |
| 231 | + page_token: Optional[str] = None, |
224 | 232 | ) -> ListSessionsResponse: |
225 | | - return self._list_sessions_impl(app_name=app_name, user_id=user_id) |
| 233 | + return self._list_sessions_impl( |
| 234 | + app_name=app_name, |
| 235 | + user_id=user_id, |
| 236 | + page_size=page_size, |
| 237 | + page_token=page_token, |
| 238 | + ) |
226 | 239 |
|
227 | 240 | def list_sessions_sync( |
228 | | - self, *, app_name: str, user_id: Optional[str] = None |
| 241 | + self, |
| 242 | + *, |
| 243 | + app_name: str, |
| 244 | + user_id: Optional[str] = None, |
| 245 | + page_size: Optional[int] = None, |
| 246 | + page_token: Optional[str] = None, |
229 | 247 | ) -> ListSessionsResponse: |
230 | 248 | logger.warning('Deprecated. Please migrate to the async method.') |
231 | | - return self._list_sessions_impl(app_name=app_name, user_id=user_id) |
| 249 | + return self._list_sessions_impl( |
| 250 | + app_name=app_name, |
| 251 | + user_id=user_id, |
| 252 | + page_size=page_size, |
| 253 | + page_token=page_token, |
| 254 | + ) |
232 | 255 |
|
233 | 256 | def _list_sessions_impl( |
234 | | - self, *, app_name: str, user_id: Optional[str] = None |
| 257 | + self, |
| 258 | + *, |
| 259 | + app_name: str, |
| 260 | + user_id: Optional[str] = None, |
| 261 | + page_size: Optional[int] = None, |
| 262 | + page_token: Optional[str] = None, |
235 | 263 | ) -> ListSessionsResponse: |
236 | 264 | empty_response = ListSessionsResponse() |
237 | 265 | if app_name not in self.sessions: |
238 | 266 | return empty_response |
239 | 267 | if user_id is not None and user_id not in self.sessions[app_name]: |
240 | 268 | return empty_response |
241 | 269 |
|
242 | | - sessions_without_events = [] |
| 270 | + all_sessions = [] |
243 | 271 |
|
244 | 272 | if user_id is None: |
245 | | - for user_id in self.sessions[app_name]: |
246 | | - for session_id in self.sessions[app_name][user_id]: |
247 | | - session = self.sessions[app_name][user_id][session_id] |
| 273 | + for uid in self.sessions[app_name]: |
| 274 | + for session_id in self.sessions[app_name][uid]: |
| 275 | + session = self.sessions[app_name][uid][session_id] |
248 | 276 | copied_session = copy.deepcopy(session) |
249 | 277 | copied_session.events = [] |
250 | | - copied_session = self._merge_state(app_name, user_id, copied_session) |
251 | | - sessions_without_events.append(copied_session) |
| 278 | + copied_session = self._merge_state(app_name, uid, copied_session) |
| 279 | + all_sessions.append(copied_session) |
252 | 280 | else: |
253 | 281 | for session in self.sessions[app_name][user_id].values(): |
254 | 282 | copied_session = copy.deepcopy(session) |
255 | 283 | copied_session.events = [] |
256 | 284 | copied_session = self._merge_state(app_name, user_id, copied_session) |
257 | | - sessions_without_events.append(copied_session) |
258 | | - return ListSessionsResponse(sessions=sessions_without_events) |
| 285 | + all_sessions.append(copied_session) |
| 286 | + |
| 287 | + # Sort by last_update_time descending (most recently updated first) |
| 288 | + all_sessions.sort( |
| 289 | + key=lambda s: s.last_update_time if s.last_update_time else 0, |
| 290 | + reverse=True, |
| 291 | + ) |
| 292 | + |
| 293 | + effective_page_size = _resolve_page_size(page_size) |
| 294 | + offset = _decode_page_token(page_token) |
| 295 | + |
| 296 | + page = all_sessions[offset : offset + effective_page_size] |
| 297 | + has_next_page = (offset + effective_page_size) < len(all_sessions) |
| 298 | + next_page_token = ( |
| 299 | + _encode_page_token(offset + effective_page_size) |
| 300 | + if has_next_page |
| 301 | + else None |
| 302 | + ) |
| 303 | + return ListSessionsResponse( |
| 304 | + sessions=page, next_page_token=next_page_token |
| 305 | + ) |
259 | 306 |
|
260 | 307 | @override |
261 | 308 | async def delete_session( |
|
0 commit comments