diff --git a/src/app/api/chat/route.ts b/src/app/api/chat/route.ts index 5b87afb..2ae80be 100644 --- a/src/app/api/chat/route.ts +++ b/src/app/api/chat/route.ts @@ -234,7 +234,7 @@ export const POST = async (req: Request) => { }) as unknown as BaseChatModel; } else if (chatModelProvider && chatModel) { llm = chatModel.model; - + // Set context window size for Ollama models if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') { llm.numCtx = body.chatModel.ollamaContextWindow || 2048; diff --git a/src/app/api/search/route.ts b/src/app/api/search/route.ts index 5d3cb5f..c4f6970 100644 --- a/src/app/api/search/route.ts +++ b/src/app/api/search/route.ts @@ -98,7 +98,7 @@ export const POST = async (req: Request) => { llm = chatModelProviders[chatModelProvider][chatModel] .model as unknown as BaseChatModel | undefined; } - + if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') { llm.numCtx = body.chatModel.ollamaContextWindow || 2048; } diff --git a/src/components/ChatWindow.tsx b/src/components/ChatWindow.tsx index 8713ca5..b4882e5 100644 --- a/src/components/ChatWindow.tsx +++ b/src/components/ChatWindow.tsx @@ -337,7 +337,7 @@ const ChatWindow = ({ id }: { id?: string }) => { } }, [isMessagesLoaded, isConfigReady]); -const sendMessage = async ( + const sendMessage = async ( message: string, messageId?: string, options?: { rewriteIndex?: number }, @@ -359,10 +359,13 @@ const sendMessage = async ( if (options?.rewriteIndex !== undefined) { const rewriteIndex = options.rewriteIndex; setMessages((prev) => { - return [...prev.slice(0, messages.length > 2 ? rewriteIndex - 1 : 0)] + return [...prev.slice(0, messages.length > 2 ? rewriteIndex - 1 : 0)]; }); - - messageChatHistory = chatHistory.slice(0, messages.length > 2 ? rewriteIndex - 1 : 0) + + messageChatHistory = chatHistory.slice( + 0, + messages.length > 2 ? rewriteIndex - 1 : 0, + ); setChatHistory(messageChatHistory); } @@ -480,7 +483,8 @@ const sendMessage = async ( } }; - const ollamaContextWindow = localStorage.getItem('ollamaContextWindow') || '2048'; + const ollamaContextWindow = + localStorage.getItem('ollamaContextWindow') || '2048'; const res = await fetch('/api/chat', { method: 'POST', @@ -542,9 +546,13 @@ const sendMessage = async ( }; const rewrite = (messageId: string) => { - const messageIndex = messages.findIndex((msg) => msg.messageId === messageId); - if(messageIndex == -1) return; - sendMessage(messages[messageIndex - 1].content, messageId, { rewriteIndex: messageIndex }); + const messageIndex = messages.findIndex( + (msg) => msg.messageId === messageId, + ); + if (messageIndex == -1) return; + sendMessage(messages[messageIndex - 1].content, messageId, { + rewriteIndex: messageIndex, + }); }; useEffect(() => { diff --git a/src/components/MessageInput.tsx b/src/components/MessageInput.tsx index 4b0d31f..a72381a 100644 --- a/src/components/MessageInput.tsx +++ b/src/components/MessageInput.tsx @@ -77,7 +77,9 @@ const MessageInput = ({ }} className={cn( 'bg-light-secondary dark:bg-dark-secondary p-4 flex items-center border border-light-200 dark:border-dark-200', - mode === 'multi' ? 'flex-col rounded-lg' : 'flex-col md:flex-row rounded-lg md:rounded-full', + mode === 'multi' + ? 'flex-col rounded-lg' + : 'flex-col md:flex-row rounded-lg md:rounded-full', )} > {mode === 'single' && ( @@ -130,7 +132,7 @@ const MessageInput = ({ )} - + {mode === 'multi' && (
diff --git a/src/components/MessageInputActions/Optimization.tsx b/src/components/MessageInputActions/Optimization.tsx index 9ea4896..0126f53 100644 --- a/src/components/MessageInputActions/Optimization.tsx +++ b/src/components/MessageInputActions/Optimization.tsx @@ -35,12 +35,11 @@ const OptimizationModes = [ const Optimization = ({ optimizationMode, - setOptimizationMode + setOptimizationMode, }: { optimizationMode: string; setOptimizationMode: (mode: string) => void; }) => { - const handleOptimizationChange = (mode: string) => { setOptimizationMode(mode); localStorage.setItem('optimizationMode', mode); diff --git a/src/components/SearchImages.tsx b/src/components/SearchImages.tsx index 56eca26..f41ab46 100644 --- a/src/components/SearchImages.tsx +++ b/src/components/SearchImages.tsx @@ -46,20 +46,20 @@ const SearchImages = ({ 'Content-Type': 'application/json', }, body: JSON.stringify({ - query: query, - chatHistory: chatHistory, - chatModel: { - provider: chatModelProvider, - model: chatModel, - ...(chatModelProvider === 'custom_openai' && { - customOpenAIBaseURL: customOpenAIBaseURL, - customOpenAIKey: customOpenAIKey, - }), - ...(chatModelProvider === 'ollama' && { - ollamaContextWindow: parseInt(ollamaContextWindow), - }), - }, - }), + query: query, + chatHistory: chatHistory, + chatModel: { + provider: chatModelProvider, + model: chatModel, + ...(chatModelProvider === 'custom_openai' && { + customOpenAIBaseURL: customOpenAIBaseURL, + customOpenAIKey: customOpenAIKey, + }), + ...(chatModelProvider === 'ollama' && { + ollamaContextWindow: parseInt(ollamaContextWindow), + }), + }, + }), }); const data = await res.json(); diff --git a/src/components/SearchVideos.tsx b/src/components/SearchVideos.tsx index 1202983..5b56256 100644 --- a/src/components/SearchVideos.tsx +++ b/src/components/SearchVideos.tsx @@ -56,25 +56,25 @@ const Searchvideos = ({ localStorage.getItem('ollamaContextWindow') || '2048'; const res = await fetch(`/api/videos`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: query, + chatHistory: chatHistory, + chatModel: { + provider: chatModelProvider, + model: chatModel, + ...(chatModelProvider === 'custom_openai' && { + customOpenAIBaseURL: customOpenAIBaseURL, + customOpenAIKey: customOpenAIKey, + }), + ...(chatModelProvider === 'ollama' && { + ollamaContextWindow: parseInt(ollamaContextWindow), + }), }, - body: JSON.stringify({ - query: query, - chatHistory: chatHistory, - chatModel: { - provider: chatModelProvider, - model: chatModel, - ...(chatModelProvider === 'custom_openai' && { - customOpenAIBaseURL: customOpenAIBaseURL, - customOpenAIKey: customOpenAIKey, - }), - ...(chatModelProvider === 'ollama' && { - ollamaContextWindow: parseInt(ollamaContextWindow), - }), - }, - }), + }), }); const data = await res.json();