sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-23 15:38:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix deleting new messages generated after conversation load

Browse source
This commit is contained in:
Debanjum 2024-10-30 18:10:43 -07:00
parent cb90abc660
commit e8e6ead39f
8 changed files with 60 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/interface/web/app/chat/page.tsx
View file

@ -29,6 +29,7 @@ interface ChatBodyDataProps {
onConversationIdChange?: (conversationId: string) => void;
setQueryToProcess: (query: string) => void;
streamedMessages: StreamMessage[];
setStreamedMessages: (messages: StreamMessage[]) => void;
setUploadedFiles: (files: string[]) => void;
isMobileWidth?: boolean;
isLoggedIn: boolean;
@ -118,6 +119,7 @@ function ChatBodyData(props: ChatBodyDataProps) {
setAgent={setAgentMetadata}
pendingMessage={processingMessage ? message : ""}
incomingMessages={props.streamedMessages}
setIncomingMessages={props.setStreamedMessages}
customClassName={chatHistoryCustomClassName}
/>
</div>
@ -351,6 +353,7 @@ export default function Chat() {
<ChatBodyData
isLoggedIn={authenticatedData !== null}
streamedMessages={messages}
setStreamedMessages={setMessages}
chatOptionsData={chatOptionsData}
setTitle={setTitle}
setQueryToProcess={setQueryToProcess}

8
src/interface/web/app/common/chatFunctions.ts
View file

@ -11,6 +11,11 @@ export interface RawReferenceData {
codeContext?: CodeContext;
}
export interface MessageMetadata {
conversationId: string;
turnId: string;
}
export interface ResponseWithIntent {
intentType: string;
response: string;
@ -90,6 +95,9 @@ export function processMessageChunk(
if (references.onlineContext) onlineContext = references.onlineContext;
if (references.codeContext) codeContext = references.codeContext;
return { context, onlineContext, codeContext };
} else if (chunk.type === "metadata") {
const messageMetadata = chunk.data as MessageMetadata;
currentMessage.turnId = messageMetadata.turnId;
} else if (chunk.type === "message") {
const chunkData = chunk.data;
// Here, handle if the response is a JSON response with an image, but the intentType is excalidraw

28
src/interface/web/app/components/chatHistory/chatHistory.tsx
View file

@ -34,8 +34,9 @@ interface ChatHistory {
interface ChatHistoryProps {
conversationId: string;
setTitle: (title: string) => void;
incomingMessages?: StreamMessage[];
pendingMessage?: string;
incomingMessages?: StreamMessage[];
setIncomingMessages?: (incomingMessages: StreamMessage[]) => void;
publicConversationSlug?: string;
setAgent: (agent: AgentData) => void;
customClassName?: string;
@ -97,6 +98,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
const [data, setData] = useState<ChatHistoryData | null>(null);
const [currentPage, setCurrentPage] = useState(0);
const [hasMoreMessages, setHasMoreMessages] = useState(true);
const [currentTurnId, setCurrentTurnId] = useState<string | null>(null);
const sentinelRef = useRef<HTMLDivElement | null>(null);
const scrollAreaRef = useRef<HTMLDivElement | null>(null);
const latestUserMessageRef = useRef<HTMLDivElement | null>(null);
@ -177,6 +179,10 @@ export default function ChatHistory(props: ChatHistoryProps) {
if (lastMessage && !lastMessage.completed) {
setIncompleteIncomingMessageIndex(props.incomingMessages.length - 1);
props.setTitle(lastMessage.rawQuery);
// Store the turnId when we get it
if (lastMessage.turnId) {
setCurrentTurnId(lastMessage.turnId);
}
}
}
}, [props.incomingMessages]);
@ -279,6 +285,8 @@ export default function ChatHistory(props: ChatHistoryProps) {
}
const handleDeleteMessage = (turnId?: string) => {
if (!turnId) return;
setData((prevData) => {
if (!prevData || !turnId) return prevData;
return {
@ -286,6 +294,13 @@ export default function ChatHistory(props: ChatHistoryProps) {
chat: prevData.chat.filter((msg) => msg.turnId !== turnId),
};
});
// Update incoming messages if they exist
if (props.incomingMessages && props.setIncomingMessages) {
props.setIncomingMessages(
props.incomingMessages.filter((msg) => msg.turnId !== turnId),
);
}
};
if (!props.conversationId && !props.publicConversationSlug) {
@ -341,6 +356,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
))}
{props.incomingMessages &&
props.incomingMessages.map((message, index) => {
const messageTurnId = message.turnId ?? currentTurnId ?? undefined;
return (
<React.Fragment key={`incomingMessage${index}`}>
<ChatMessage
@ -356,13 +372,13 @@ export default function ChatHistory(props: ChatHistoryProps) {
automationId: "",
images: message.images,
conversationId: props.conversationId,
turnId: message.turnId,
onDeleteMessage: handleDeleteMessage,
turnId: messageTurnId,
}}
customClassName="fullHistory"
borderLeftColor={`${data?.agent?.color}-500`}
onDeleteMessage={handleDeleteMessage}
conversationId={props.conversationId}
turnId={messageTurnId}
/>
{message.trainOfThought && (
<TrainOfThoughtComponent
@ -393,10 +409,10 @@ export default function ChatHistory(props: ChatHistoryProps) {
"inferred-queries": message.inferredQueries || [],
},
conversationId: props.conversationId,
turnId: message.turnId,
onDeleteMessage: handleDeleteMessage,
turnId: messageTurnId,
}}
conversationId={props.conversationId}
turnId={messageTurnId}
onDeleteMessage={handleDeleteMessage}
customClassName="fullHistory"
borderLeftColor={`${data?.agent?.color}-500`}
@ -418,7 +434,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
by: "you",
automationId: "",
conversationId: props.conversationId,
onDeleteMessage: handleDeleteMessage,
turnId: undefined,
}}
conversationId={props.conversationId}
onDeleteMessage={handleDeleteMessage}

27
src/interface/web/app/components/chatMessage/chatMessage.tsx
View file

@ -149,7 +149,6 @@ export interface SingleChatMessage {
images?: string[];
conversationId: string;
turnId?: string;
onDeleteMessage: (turnId: string) => void;
}
export interface StreamMessage {
@ -249,6 +248,7 @@ interface ChatMessageProps {
agent?: AgentData;
onDeleteMessage: (turnId?: string) => void;
conversationId: string;
turnId?: string;
}
interface TrainOfThoughtProps {
@ -662,6 +662,7 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
}
const deleteMessage = async (message: SingleChatMessage) => {
const turnId = message.turnId || props.turnId;
const response = await fetch("/api/chat/conversation/message", {
method: "DELETE",
headers: {
@ -669,13 +670,13 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
},
body: JSON.stringify({
conversation_id: props.conversationId,
turn_id: message.turnId,
turn_id: turnId,
}),
});
if (response.ok) {
// Update the UI after successful deletion
props.onDeleteMessage(message.turnId);
props.onDeleteMessage(turnId);
} else {
console.error("Failed to delete message");
}
@ -743,6 +744,16 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
/>
</button>
))}
<button
title="Delete"
className={`${styles.deleteButton}`}
onClick={() => deleteMessage(props.chatMessage)}
>
<Trash
alt="Delete Message"
className="hsl(var(--muted-foreground)) hover:text-red-500"
/>
</button>
<button
title="Copy"
className={`${styles.copyButton}`}
@ -764,16 +775,6 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
/>
)}
</button>
<button
title="Delete"
className={`${styles.deleteButton}`}
onClick={() => deleteMessage(props.chatMessage)}
>
<Trash
alt="Delete Message"
className="hsl(var(--muted-foreground)) hover:text-red-500"
/>
</button>
{props.chatMessage.by === "khoj" &&
(props.chatMessage.intent ? (
<FeedbackButtons

2
src/interface/web/app/factchecker/page.tsx
View file

@ -197,7 +197,6 @@ function ReferenceVerification(props: ReferenceVerificationProps) {
codeContext: {},
conversationId: props.conversationId,
turnId: "",
onDeleteMessage: (turnId?: string) => {},
}}
isMobileWidth={isMobileWidth}
onDeleteMessage={(turnId?: string) => {}}
@ -633,7 +632,6 @@ export default function FactChecker() {
codeContext: {},
conversationId: conversationID,
turnId: "",
onDeleteMessage: (turnId?: string) => {},
}}
conversationId={conversationID}
onDeleteMessage={(turnId?: string) => {}}

1
src/khoj/processor/conversation/utils.py
View file

@ -186,6 +186,7 @@ class ChatEvent(Enum):
MESSAGE = "message"
REFERENCES = "references"
STATUS = "status"
METADATA = "metadata"
def message_to_log(

19
src/khoj/routers/api_chat.py
View file

@ -569,6 +569,7 @@ async def chat(
stream = body.stream
title = body.title
conversation_id = body.conversation_id
turn_id = str(body.turn_id or uuid.uuid4())
city = body.city
region = body.region
country = body.country or get_country_name_from_timezone(body.timezone)
@ -588,7 +589,7 @@ async def chat(
nonlocal conversation_id
tracer: dict = {
"mid": f"{uuid.uuid4()}",
"mid": turn_id,
"cid": conversation_id,
"uid": user.id,
"khoj_version": state.khoj_version,
@ -621,7 +622,7 @@ async def chat(
if event_type == ChatEvent.MESSAGE:
yield data
elif event_type == ChatEvent.REFERENCES or stream:
elif event_type == ChatEvent.REFERENCES or ChatEvent.METADATA or stream:
yield json.dumps({"type": event_type.value, "data": data}, ensure_ascii=False)
except asyncio.CancelledError as e:
connection_alive = False
@ -665,6 +666,11 @@ async def chat(
metadata=chat_metadata,
)
if is_query_empty(q):
async for result in send_llm_response("Please ask your query to get started."):
yield result
return
conversation_commands = [get_conversation_command(query=q, any_references=True)]
conversation = await ConversationAdapters.aget_conversation_by_user(
@ -680,6 +686,9 @@ async def chat(
return
conversation_id = conversation.id
async for event in send_event(ChatEvent.METADATA, {"conversationId": str(conversation_id), "turnId": turn_id}):
yield event
agent: Agent | None = None
default_agent = await AgentAdapters.aget_default_agent()
if conversation.agent and conversation.agent != default_agent:
@ -691,17 +700,11 @@ async def chat(
agent = default_agent
await is_ready_to_chat(user)
user_name = await aget_user_name(user)
location = None
if city or region or country or country_code:
location = LocationData(city=city, region=region, country=country, country_code=country_code)
if is_query_empty(q):
async for result in send_llm_response("Please ask your query to get started."):
yield result
return
user_message_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
meta_log = conversation.conversation_log

1
src/khoj/routers/helpers.py
View file

@ -1255,6 +1255,7 @@ class ChatRequestBody(BaseModel):
stream: Optional[bool] = False
title: Optional[str] = None
conversation_id: Optional[str] = None
turn_id: Optional[str] = None
city: Optional[str] = None
region: Optional[str] = None
country: Optional[str] = None