Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(api): preserve timestamp ties in message pagination (#44023)
mika310c2e38a5b3
diff --git a/api/repositories/installed_app_message_repository.py b/api/repositories/installed_app_message_repository.pyindex 30dd6148de2..47f6fe8e481 100644--- a/api/repositories/installed_app_message_repository.py+++ b/api/repositories/installed_app_message_repository.py@@ -3,7 +3,7 @@from typing import cast, overridefrom pydantic import JsonValue-from sqlalchemy import select+from sqlalchemy import and_, or_, selectfrom sqlalchemy.orm import Session, sessionmakerfrom models.enums import ConversationFromSource, FeedbackFromSource, FeedbackRating@@ -65,12 +65,19 @@ class SQLAlchemyInstalledAppMessageRepository(InstalledAppMessageStore):f"The first_id cursor {first_id} does not belong to conversation {conversation_id}.")statement = statement.where(- Message.created_at < first_message.created_at, Message.id != first_message.id+ or_(+ Message.created_at < first_message.created_at,+ and_(+ Message.created_at == first_message.created_at,+ Message.id < first_message.id,+ ),+ ))- messages = list(session.scalars(statement.order_by(Message.created_at.desc()).limit(limit + 1)).all())+ messages = list(+ session.scalars(statement.order_by(Message.created_at.desc(), Message.id.desc()).limit(limit + 1)).all()+ )has_more = len(messages) > limit- # Preserve ascending presentation of each newest-first page and the- # existing strict timestamp cursor, including tied timestamps.+ # Preserve ascending presentation of each newest-first page.messages = messages[:limit]messages.reverse()return MessagePage(diff --git a/api/repositories/saved_message_repository.py b/api/repositories/saved_message_repository.pyindex e27048c4676..b944ccefcf8 100644--- a/api/repositories/saved_message_repository.py+++ b/api/repositories/saved_message_repository.py@@ -1,6 +1,6 @@from typing import cast, override-from sqlalchemy import select+from sqlalchemy import and_, or_, selectfrom sqlalchemy.orm import Session, sessionmakerfrom models.enums import CreatorUserRole@@ -50,9 +50,16 @@ class SQLAlchemySavedMessageRepository(SavedMessageStore):last_message = session.scalar(stmt.where(Message.id == last_id).limit(1))if last_message is None:raise LastMessageNotExistsError("The last_id cursor does not belong to the current saved messages.")- stmt = stmt.where(Message.created_at < last_message.created_at, Message.id != last_message.id)+ stmt = stmt.where(+ or_(+ Message.created_at < last_message.created_at,+ and_(Message.created_at == last_message.created_at, Message.id < last_message.id),+ )+ )- messages = list(session.scalars(stmt.order_by(Message.created_at.desc()).limit(fetch_limit)).all())+ messages = list(+ session.scalars(stmt.order_by(Message.created_at.desc(), Message.id.desc()).limit(fetch_limit)).all()+ )has_more = len(messages) > limitif has_more:messages = messages[:limit]diff --git a/api/tests/unit_tests/repositories/test_installed_app_message_repository.py b/api/tests/unit_tests/repositories/test_installed_app_message_repository.pyindex 37b4ce35024..14f5200a0a8 100644--- a/api/tests/unit_tests/repositories/test_installed_app_message_repository.py+++ b/api/tests/unit_tests/repositories/test_installed_app_message_repository.py@@ -183,7 +183,7 @@ def test_page_keeps_cursor_order_and_detaches_complete_message_data(assert thought.created_at == earlier.created_at-def test_empty_conversation_and_strict_timestamp_ties_preserve_legacy_page_behavior(+def test_empty_conversation_and_timestamp_ties_preserve_all_pages(sqlite_session_factory: sessionmaker[Session], installation: InstalledAppRef) -> None:repository = SQLAlchemyInstalledAppMessageRepository(session_factory=sqlite_session_factory)@@ -192,20 +192,22 @@ def test_empty_conversation_and_strict_timestamp_ties_preserve_legacy_page_behav) == MessagePage(limit=20, has_more=False, data=())with sqlite_session_factory.begin() as session:conversation = _conversation(session, installation)- _message(session, conversation)- _message(session, conversation)- page = repository.get_page(+ messages = [_message(session, conversation), _message(session, conversation)]+ first = repository.get_page(installed_app=installation, account_id=_ACCOUNT_ID, conversation_id=conversation.id, first_id=None, limit=1)- assert page.has_more is True- assert len(page.data) == 1- assert repository.get_page(+ second = repository.get_page(installed_app=installation,account_id=_ACCOUNT_ID,conversation_id=conversation.id,- first_id=page.data[0].id,+ first_id=first.data[0].id,limit=1,- ) == MessagePage(limit=1, has_more=False, data=())+ )+ assert first.has_more is True+ assert second.has_more is False+ assert [item.id for item in (*first.data, *second.data)] == sorted(+ (message.id for message in messages), reverse=True+ )@pytest.mark.parametrize("mismatch", ["app_id", "from_account_id", "from_source", "from_end_user_id", "is_deleted"])diff --git a/api/tests/unit_tests/repositories/test_saved_message_repository.py b/api/tests/unit_tests/repositories/test_saved_message_repository.pyindex 30201dcac61..040bacc08b3 100644--- a/api/tests/unit_tests/repositories/test_saved_message_repository.py+++ b/api/tests/unit_tests/repositories/test_saved_message_repository.py@@ -198,6 +198,34 @@ def test_list_paginates_after_last_id(sqlite_session_factory: sessionmaker[Sessiassert [record.id for record in result.data] == [oldest.id]+def test_list_paginates_messages_with_tied_created_at(sqlite_session_factory: sessionmaker[Session]) -> None:+ actor = SavedMessageActor.account(_ACCOUNT_ID)+ created_at = datetime(2026, 1, 2)+ with sqlite_session_factory.begin() as session:+ _persist_app(session)+ messages = [+ _persist_message(session, actor=actor, created_at=created_at),+ _persist_message(session, actor=actor, created_at=created_at),+ ]+ for message in messages:+ _save_message(session, app_id=_APP_ID, actor=actor, message_id=message.id)++ repository = _repository(sqlite_session_factory)+ first = repository.pagination_by_last_id(app_id=_APP_ID, actor=actor, last_id=None, limit=1)+ second = repository.pagination_by_last_id(+ app_id=_APP_ID,+ actor=actor,+ last_id=first.data[-1].id,+ limit=1,+ )++ assert first.has_more is True+ assert second.has_more is False+ assert [record.id for record in (*first.data, *second.data)] == sorted(+ (message.id for message in messages), reverse=True+ )++def test_list_rejects_last_id_outside_saved_set(sqlite_session_factory: sessionmaker[Session]) -> None:actor = SavedMessageActor.account(_ACCOUNT_ID)with sqlite_session_factory.begin() as session: