klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-02 13:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get conversation by title when requested via chat API

Browse Source
This commit is contained in:
Debanjum Singh Solanky
2024-03-15 12:03:47 +05:30
parent cac26dafe3
commit c9e05dc184
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/khoj/database/adapters/__init__.py
View File

@@ -436,16 +436,16 @@ class ConversationAdapters:
@staticmethod
async def aget_conversation_by_user(
user: KhojUser, client_application: ClientApplication = None, conversation_id: int = None, slug: str = None
user: KhojUser, client_application: ClientApplication = None, conversation_id: int = None, title: str = None
):
if conversation_id:
return await Conversation.objects.filter(user=user, client=client_application, id=conversation_id).afirst()
elif slug:
return await Conversation.objects.filter(user=user, client=client_application, slug=slug).afirst()
elif title:
return await Conversation.objects.filter(user=user, client=client_application, title=title).afirst()
else:
return await (
Conversation.objects.filter(user=user, client=client_application).order_by("-updated_at").afirst()
) or Conversation.objects.acreate(user=user, client=client_application, slug=slug)
) or Conversation.objects.acreate(user=user, client=client_application)
@staticmethod
async def adelete_conversation_by_user(

11
src/khoj/routers/api_chat.py
View File

@@ -224,7 +224,7 @@ async def chat(
n: Optional[int] = 5,
d: Optional[float] = 0.18,
stream: Optional[bool] = False,
slug: Optional[str] = None,
title: Optional[str] = None,
conversation_id: Optional[int] = None,
city: Optional[str] = None,
region: Optional[str] = None,
@@ -251,9 +251,14 @@ async def chat(
return StreamingResponse(iter([formatted_help]), media_type="text/event-stream", status_code=200)
conversation = await ConversationAdapters.aget_conversation_by_user(
user, request.user.client_app, conversation_id, slug
user, request.user.client_app, conversation_id, title
)
meta_log = conversation.conversation_log if conversation else {}
if not conversation:
return Response(
content=f"No conversation found with requested id, title", media_type="text/plain", status_code=400
)
else:
meta_log = conversation.conversation_log
if conversation_commands == [ConversationCommand.Default]:
conversation_commands = await aget_relevant_information_sources(q, meta_log)