refac
This commit is contained in:
1 parent
256cce505b
commit
14e4d72d9a
8 files changed
+45
-16
No files matched your search
@@ -502,13 +502,14 @@
|
||||
return;
|
||||
}
|
||||
|
||||
await resolveChatMessageToolCall(localStorage.token, $chatId, messageId, callId, 'answer', {
|
||||
const res = await resolveChatMessageToolCall(localStorage.token, $chatId, messageId, callId, 'answer', {
|
||||
answers,
|
||||
timed_out: timedOut
|
||||
}).catch(async (error) => {
|
||||
toast.error(`${error}`);
|
||||
await loadChat();
|
||||
});
|
||||
onToolCallResolved(res);
|
||||
};
|
||||
|
||||
const rejectPendingAskUser = async (messageId, callId) => {
|
||||
@@ -516,7 +517,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
await resolveChatMessageToolCall(
|
||||
const res = await resolveChatMessageToolCall(
|
||||
localStorage.token,
|
||||
$chatId,
|
||||
messageId,
|
||||
@@ -526,6 +527,7 @@
|
||||
toast.error(`${error}`);
|
||||
await loadChat();
|
||||
});
|
||||
onToolCallResolved(res);
|
||||
};
|
||||
|
||||
$: pendingAskUser = findPendingAskUser(history);
|
||||
@@ -658,6 +660,13 @@
|
||||
}
|
||||
};
|
||||
|
||||
const onToolCallResolved = (res) => {
|
||||
const newTaskIds = res?.task_ids ?? (res?.task_id ? [res.task_id] : []);
|
||||
if (newTaskIds.length > 0) {
|
||||
taskIds = [...(taskIds ?? []), ...newTaskIds];
|
||||
}
|
||||
};
|
||||
|
||||
let oldSelectedModelIds = [''];
|
||||
$: if (!equal(selectedModelIds, oldSelectedModelIds)) {
|
||||
onSelectedModelIdsChange();
|
||||
@@ -3568,10 +3577,7 @@
|
||||
await handleOpenAIError(res.error, responseMessage);
|
||||
} else {
|
||||
// Backend returns task_ids (multi-model) or task_id (single model)
|
||||
const newTaskIds = res.task_ids ?? (res.task_id ? [res.task_id] : []);
|
||||
if (newTaskIds.length > 0) {
|
||||
taskIds = [...(taskIds ?? []), ...newTaskIds];
|
||||
}
|
||||
onToolCallResolved(res);
|
||||
|
||||
// Backend returns chat_id for new chats — set store + URL.
|
||||
// Only update if the user hasn't navigated to a different chat
|
||||
@@ -4287,6 +4293,7 @@
|
||||
{mergeResponses}
|
||||
{chatActionHandler}
|
||||
{addMessages}
|
||||
{onToolCallResolved}
|
||||
allowDelete={!(generating || taskIds?.length)}
|
||||
forkHandler={handleForkChat}
|
||||
topPadding={!embedded}
|
||||
|
||||
Reference in new issue
Block a user