Skip to content
Merged
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
9,775 changes: 6,443 additions & 3,332 deletions docs/openapi.json

Large diffs are not rendered by default.

119 changes: 86 additions & 33 deletions docs/responses.md

Large diffs are not rendered by default.

40 changes: 10 additions & 30 deletions src/app/endpoints/conversations_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from configuration import configuration
from models.config import Action
from models.database.conversations import (
UserTurn,
UserConversation,
)
from models.requests import ConversationUpdateRequest
Expand All @@ -38,14 +37,18 @@
check_configuration_loaded,
delete_conversation,
retrieve_conversation,
retrieve_conversation_turns,
validate_and_retrieve_conversation,
)
from utils.suid import (
check_suid,
normalize_conversation_id,
to_llama_stack_conversation_id,
)
from utils.conversations import build_conversation_turns_from_items
from utils.conversations import (
build_conversation_turns_from_items,
get_all_conversation_items,
)
from log import get_logger

logger = get_logger(__name__)
Expand Down Expand Up @@ -236,46 +239,23 @@ async def get_conversation_endpoint_handler( # pylint: disable=too-many-locals,
llama_stack_conv_id,
)

# Use Conversations API to retrieve conversation items
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extracted to get_all_conversation_items

conversation_items_response = await client.conversations.items.list(
conversation_id=llama_stack_conv_id,
after=None,
include=None,
limit=None,
order="asc", # oldest first
)
# Retrieve turns metadata from database (can be empty for legacy conversations)
db_turns = retrieve_conversation_turns(normalized_conv_id)

if not conversation_items_response.data:
# Use Conversations API to retrieve conversation items
items = await get_all_conversation_items(client, llama_stack_conv_id)
if not items:
logger.error("No items found for conversation %s", conversation_id)
response = NotFoundResponse(
resource="conversation", resource_id=normalized_conv_id
).model_dump()
raise HTTPException(**response)

items = conversation_items_response.data

logger.info(
"Successfully retrieved %d items for conversation %s",
len(items),
conversation_id,
)
# Retrieve turns metadata from database
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extracted to retrieve_conversation_turns

db_turns: list[UserTurn] = []
try:
with get_session() as session:
db_turns = (
session.query(UserTurn)
.filter_by(conversation_id=normalized_conv_id)
.order_by(UserTurn.turn_number)
.all()
)
except SQLAlchemyError as e:
logger.error(
"Database error occurred while retrieving conversation turns for %s.",
normalized_conv_id,
)
response = InternalServerErrorResponse.database_error()
raise HTTPException(**response.model_dump()) from e

# Build conversation turns from items and populate turns metadata
# Use conversation.created_at for legacy conversations without turn metadata
Expand Down
8 changes: 4 additions & 4 deletions src/app/endpoints/query.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# pylint: disable=too-many-locals,too-many-branches,too-many-nested-blocks

"""Handler for REST API call to provide answer to query using Response API."""

import datetime
Expand Down Expand Up @@ -264,7 +262,7 @@ async def query_endpoint_handler(
)


async def retrieve_response( # pylint: disable=too-many-locals
async def retrieve_response(
client: AsyncLlamaStackClient,
responses_params: ResponsesApiParams,
moderation_result: ShieldModerationResult,
Expand All @@ -291,7 +289,9 @@ async def retrieve_response( # pylint: disable=too-many-locals
responses_params.input,
[moderation_result.refusal_response],
)
return TurnSummary(llm_response=moderation_result.message)
return TurnSummary(
id=moderation_result.moderation_id, llm_response=moderation_result.message
)
try:
response = await client.responses.create(
**responses_params.model_dump(exclude_none=True)
Expand Down
Loading
Loading