Skip to content

Fix tool choice #4596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2025
+31 −34
Merged

Fix tool choice #4596

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26f6dad
Fix tool choice
Weves Apr 24, 2025
2a205fe
fix
Weves Apr 24, 2025
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
4 changes: 2 additions & 2 deletions web/src/app/chat/ChatPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
processRawChatHistory,
removeMessage,
sendMessage,
SendMessageParams,
setMessageAsLatest,
updateLlmOverrideForChatSession,
updateParentChildren,
Expand Down Expand Up @@ -1080,7 +1081,7 @@ export function ChatPage({

async function updateCurrentMessageFIFO(
stack: CurrentMessageFIFO,
params: any
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove the evil any !

params: SendMessageParams
) {
try {
for await (const packet of sendMessage(params)) {
Expand Down Expand Up @@ -1374,7 +1375,6 @@ export function ChatPage({
regenerationRequest?.parentMessage.messageId ||
lastSuccessfulMessageId,
chatSessionId: currChatSessionId,
promptId: null,
filters: buildFilters(
filterManager.selectedSources,
filterManager.selectedDocumentSets,
Expand Down
57 changes: 25 additions & 32 deletions web/src/app/chat/lib.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,29 @@ export type PacketType =
| AgenticMessageResponseIDInfo
| UserKnowledgeFilePacket;

export interface SendMessageParams {
regenerate: boolean;
message: string;
fileDescriptors: FileDescriptor[];
parentMessageId: number | null;
chatSessionId: string;
filters: Filters | null;
selectedDocumentIds: number[] | null;
queryOverride?: string;
forceSearch?: boolean;
modelProvider?: string;
modelVersion?: string;
temperature?: number;
systemPromptOverride?: string;
useExistingUserMessage?: boolean;
alternateAssistantId?: number;
signal?: AbortSignal;
userFileIds?: number[];
userFolderIds?: number[];
forceUserFileSearch?: boolean;
useLanggraph?: boolean;
}

export async function* sendMessage({
regenerate,
message,
Expand All @@ -168,7 +191,6 @@ export async function* sendMessage({
userFolderIds,
parentMessageId,
chatSessionId,
promptId,
filters,
selectedDocumentIds,
queryOverride,
Expand All @@ -182,37 +204,14 @@ export async function* sendMessage({
signal,
forceUserFileSearch,
useLanggraph,
}: {
regenerate: boolean;
message: string;
fileDescriptors: FileDescriptor[];
parentMessageId: number | null;
chatSessionId: string;
promptId: number | null | undefined;
filters: Filters | null;
selectedDocumentIds: number[] | null;
queryOverride?: string;
forceSearch?: boolean;
modelProvider?: string;
modelVersion?: string;
temperature?: number;
systemPromptOverride?: string;
useExistingUserMessage?: boolean;
alternateAssistantId?: number;
signal?: AbortSignal;
userFileIds?: number[];
userFolderIds?: number[];
forceUserFileSearch?: boolean;
useLanggraph?: boolean;
}): AsyncGenerator<PacketType, void, unknown> {
}: SendMessageParams): AsyncGenerator<PacketType, void, unknown> {
const documentsAreSelected =
selectedDocumentIds && selectedDocumentIds.length > 0;
const body = JSON.stringify({
alternate_assistant_id: alternateAssistantId,
chat_session_id: chatSessionId,
parent_message_id: parentMessageId,
message: message,
prompt_id: promptId,
search_doc_ids: documentsAreSelected ? selectedDocumentIds : null,
force_user_file_search: forceUserFileSearch,
file_descriptors: fileDescriptors,
Expand All @@ -221,13 +220,7 @@ export async function* sendMessage({
regenerate,
retrieval_options: !documentsAreSelected
? {
run_search:
promptId === null ||
promptId === undefined ||
queryOverride ||
forceSearch
? "always"
: "auto",
run_search: queryOverride || forceSearch ? "always" : "auto",
real_time: true,
filters: filters,
}
Expand Down
Loading