Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from datetime import datetime
from typing import Optional

from conversations.display_history.persistence.models import UserAgenticTurn
from conversations.display_history.persistence.session import display_history_session
from models.database.conversations import UserConversation
from models.database.conversations import UserConversation, UserTurn


def get_conversation_by_id(conversation_id: str) -> Optional[UserConversation]:
Expand Down Expand Up @@ -110,13 +111,24 @@ def update_conversation_topic_summary(conversation_id: str, topic_summary: str)


def delete_conversation(conversation_id: str) -> bool:
"""Delete a conversation. Returns True if one was removed."""
"""Remove a conversation and all of its turns and agentic history.

Returns:
True when a conversation was deleted, False when the id was not found.

"""
with display_history_session("delete conversation") as session:
db_conversation = (
session.query(UserConversation).filter_by(id=conversation_id).first()
)
if db_conversation is None:
return False
session.query(UserAgenticTurn).filter_by(
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
conversation_id=conversation_id
).delete(synchronize_session=False)
session.query(UserTurn).filter_by(conversation_id=conversation_id).delete(
synchronize_session=False
)
session.delete(db_conversation)
session.commit()
return True
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
from sqlalchemy.engine import Engine
from sqlalchemy.orm import Session

from conversations.display_history.agentic.models.agent_turn_summary import (
AgentTurnSummary,
)
from conversations.display_history.persistence.repository.agentic_turn import (
insert_agentic_turn,
list_agentic_turns_for_conversation,
)
from conversations.display_history.persistence.repository.conversation import (
delete_conversation,
get_conversation_by_id,
Expand All @@ -16,6 +23,9 @@
update_conversation_metadata,
update_conversation_topic_summary,
)
from conversations.display_history.persistence.repository.turn import (
list_turns_for_conversation,
)
from tests.unit.conversations.display_history.persistence.sample_rows import (
SAMPLE_CONVERSATION,
TEST_CONVERSATION_ID,
Expand Down Expand Up @@ -113,3 +123,25 @@ def test_conversation_repository_round_trip(memory_engine: Engine) -> None:

assert delete_conversation(TEST_CONVERSATION_ID) is True
assert get_conversation_by_id(TEST_CONVERSATION_ID) is None


@pytest.mark.usefixtures("patch_display_history_session")
def test_delete_conversation_removes_turns_and_agentic_rows(
memory_engine: Engine,
) -> None:
"""Delete removes child rows without relying on database CASCADE."""
with Session(memory_engine) as session:
conversation_id, turn_number = seed_sample_conversation_and_turn(session)

insert_agentic_turn(
conversation_id,
turn_number,
AgentTurnSummary(status="completed"),
)
assert list_turns_for_conversation(conversation_id)
assert list_agentic_turns_for_conversation(conversation_id)

assert delete_conversation(conversation_id) is True
assert get_conversation_by_id(conversation_id) is None
assert list_turns_for_conversation(conversation_id) == []
assert list_agentic_turns_for_conversation(conversation_id) == []
Loading