🤖 feat: Support o4-mini and o3 Models (#6928)

* feat: Add support for new OpenAI models (o4-mini, o3) and update related logic

* 🔧 fix: Rename 'resubmitFiles' to 'isResubmission' for consistency across types and hooks

* 🔧 fix: Replace hardcoded 'pending_req' with CacheKeys.PENDING_REQ for consistency in cache handling

* 🔧 fix: Update cache handling to use Time.ONE_MINUTE instead of hardcoded TTL and streamline imports

* 🔧 fix: Enhance message handling logic to correctly identify parent messages and streamline imports in useSSE
This commit is contained in:
Danny Avila 2025-04-17 00:40:26 -04:00 committed by GitHub
parent 88f4ad7c47
commit 52f146dd97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 69 additions and 53 deletions

View file

@ -90,7 +90,7 @@ export default function useChatFunctions({
{
editedText = null,
editedMessageId = null,
resubmitFiles = false,
isResubmission = false,
isRegenerate = false,
isContinued = false,
isEdited = false,
@ -202,7 +202,7 @@ export default function useChatFunctions({
};
const reuseFiles =
(isRegenerate || resubmitFiles) && parentMessage?.files && parentMessage.files.length > 0;
(isRegenerate || isResubmission) && parentMessage?.files && parentMessage.files.length > 0;
if (setFiles && reuseFiles === true) {
currentMsg.files = parentMessage.files;
setFiles(new Map());
@ -298,6 +298,7 @@ export default function useChatFunctions({
isEdited: isEditOrContinue,
isContinued,
isRegenerate,
isResubmission,
initialResponse,
isTemporary,
ephemeralAgent,

View file

@ -1,7 +1,8 @@
import debounce from 'lodash/debounce';
import { SetterOrUpdater, useRecoilValue } from 'recoil';
import { useState, useEffect, useMemo, useCallback } from 'react';
import { LocalStorageKeys, TFile } from 'librechat-data-provider';
import { LocalStorageKeys, Constants } from 'librechat-data-provider';
import type { TFile } from 'librechat-data-provider';
import type { ExtendedFile } from '~/common';
import { useChatFormContext } from '~/Providers';
import { useGetFiles } from '~/data-provider';
@ -34,11 +35,13 @@ const decodeBase64 = (base64String: string): string => {
};
export const useAutoSave = ({
conversationId,
isSubmitting,
conversationId: _conversationId,
textAreaRef,
setFiles,
files,
}: {
isSubmitting?: boolean;
conversationId?: string | null;
textAreaRef?: React.RefObject<HTMLTextAreaElement>;
files: Map<string, ExtendedFile>;
@ -47,6 +50,7 @@ export const useAutoSave = ({
// setting for auto-save
const { setValue } = useChatFormContext();
const saveDrafts = useRecoilValue<boolean>(store.saveDrafts);
const conversationId = isSubmitting ? Constants.PENDING_CONVO : _conversationId;
const [currentConversationId, setCurrentConversationId] = useState<string | null>(null);
const fileIds = useMemo(() => Array.from(files.keys()), [files]);

View file

@ -613,8 +613,17 @@ export default function useEventHandlers({
messages?.[messages.length - 1] != null &&
messages[messages.length - 2] != null
) {
const requestMessage = messages[messages.length - 2];
let requestMessage = messages[messages.length - 2];
const responseMessage = messages[messages.length - 1];
if (requestMessage.messageId !== responseMessage.parentMessageId) {
// the request message is the parent of response, which we search for backwards
for (let i = messages.length - 3; i >= 0; i--) {
if (messages[i].messageId === responseMessage.parentMessageId) {
requestMessage = messages[i];
break;
}
}
}
finalHandler(
{
conversation: {

View file

@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
import { v4 } from 'uuid';
import { SSE } from 'sse.js';
import { useSetRecoilState } from 'recoil';
import { useQueryClient } from '@tanstack/react-query';
import {
request,
Constants,
@ -13,18 +12,12 @@ import {
removeNullishValues,
isAssistantsEndpoint,
} from 'librechat-data-provider';
import type {
EventSubmission,
TConversation,
TMessage,
TPayload,
TSubmission,
} from 'librechat-data-provider';
import type { TMessage, TPayload, TSubmission, EventSubmission } from 'librechat-data-provider';
import type { EventHandlerParams } from './useEventHandlers';
import type { TResData } from '~/common';
import { useGenTitleMutation, useGetStartupConfig, useGetUserBalance } from '~/data-provider';
import useEventHandlers, { getConvoTitle } from './useEventHandlers';
import { useAuthContext } from '~/hooks/AuthContext';
import useEventHandlers from './useEventHandlers';
import store from '~/store';
const clearDraft = (conversationId?: string | null) => {
@ -53,7 +46,6 @@ export default function useSSE(
isAddedRequest = false,
runIndex = 0,
) {
const queryClient = useQueryClient();
const genTitle = useGenTitleMutation();
const setActiveRunId = useSetRecoilState(store.activeRunFamily(runIndex));
@ -107,30 +99,6 @@ export default function useSSE(
let { userMessage } = submission;
const payloadData = createPayload(submission);
/**
* Helps clear text immediately on submission instead of
* restoring draft, which gets deleted on generation end
* */
const parentId = submission?.isRegenerate
? userMessage.overrideParentMessageId
: userMessage.parentMessageId;
setConversation?.((prev: TConversation | null) => {
if (!prev) {
return null;
}
const title =
getConvoTitle({
parentId,
queryClient,
currentTitle: prev?.title,
conversationId: prev?.conversationId,
}) ?? '';
return {
...prev,
title,
conversationId: Constants.PENDING_CONVO as string,
};
});
let { payload } = payloadData;
if (isAssistantsEndpoint(payload.endpoint) || isAgentsEndpoint(payload.endpoint)) {
payload = removeNullishValues(payload) as TPayload;