An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
Add message retry functionality
Yoshiki Miurae0130b9a6be8
diff --git a/components/answer-section.tsx b/components/answer-section.tsxindex 19f34b0b..9b90ae97 100644--- a/components/answer-section.tsx+++ b/components/answer-section.tsx@@ -1,5 +1,6 @@'use client'+import { ChatRequestOptions } from 'ai'import { CollapsibleMessage } from './collapsible-message'import { DefaultSkeleton } from './default-skeleton'import { BotMessage } from './message'@@ -11,6 +12,11 @@ export type AnswerSectionProps = {onOpenChange: (open: boolean) => voidchatId?: stringshowActions?: boolean+ messageId: string+ reload?: (+ messageId: string,+ options?: ChatRequestOptions+ ) => Promise<string | null | undefined>}export function AnswerSection({@@ -18,18 +24,29 @@ export function AnswerSection({isOpen,onOpenChange,chatId,- showActions = true // Default to true for backward compatibility+ showActions = true, // Default to true for backward compatibility+ messageId,+ reload}: AnswerSectionProps) {const enableShare = process.env.NEXT_PUBLIC_ENABLE_SHARE === 'true'+ const handleReload = () => {+ if (reload) {+ return reload(messageId)+ }+ return Promise.resolve(undefined)+ }+const message = content ? (<div className="flex flex-col gap-1"><BotMessage message={content} />{showActions && (<MessageActions- message={content}+ message={content} // Keep original message content for copy+ messageId={messageId}chatId={chatId}enableShare={enableShare}+ reload={handleReload}/>)}</div>diff --git a/components/chat-messages.tsx b/components/chat-messages.tsxindex 18cc07f7..739efbf0 100644--- a/components/chat-messages.tsx+++ b/components/chat-messages.tsx@@ -1,4 +1,4 @@-import { JSONValue, Message } from 'ai'+import { ChatRequestOptions, JSONValue, Message } from 'ai'import { useEffect, useMemo, useState } from 'react'import { RenderMessage } from './render-message'import { ToolSection } from './tool-section'@@ -14,6 +14,10 @@ interface ChatMessagesProps {/** Ref for anchoring auto-scroll position */anchorRef: React.RefObject<HTMLDivElement>onUpdateMessage?: (messageId: string, newContent: string) => Promise<void>+ reload?: (+ messageId: string,+ options?: ChatRequestOptions+ ) => Promise<string | null | undefined>}export function ChatMessages({@@ -24,7 +28,8 @@ export function ChatMessages({chatId,addToolResult,anchorRef,- onUpdateMessage+ onUpdateMessage,+ reload}: ChatMessagesProps) {const [openStates, setOpenStates] = useState<Record<string, boolean>>({})const manualToolCallId = 'manual-tool-call'@@ -99,6 +104,7 @@ export function ChatMessages({chatId={chatId}addToolResult={addToolResult}onUpdateMessage={onUpdateMessage}+ reload={reload}/></div>))}diff --git a/components/chat.tsx b/components/chat.tsxindex 4bc4fe31..c09a6839 100644--- a/components/chat.tsx+++ b/components/chat.tsx@@ -4,6 +4,7 @@ import { CHAT_ID } from '@/lib/constants'import { useAutoScroll } from '@/lib/hooks/use-auto-scroll'import { Model } from '@/lib/types/models'import { useChat } from '@ai-sdk/react'+import { ChatRequestOptions } from 'ai'import { Message } from 'ai/react'import { useEffect } from 'react'import { toast } from 'sonner'@@ -109,6 +110,30 @@ export function Chat({}}+ // Function to trim messages and reload from a specific message+ const handleReloadFrom = async (+ messageId: string,+ options?: ChatRequestOptions+ ) => {+ // Find the index of the message with the specified ID+ const messageIndex = messages.findIndex(m => m.id === messageId)+ if (messageIndex !== -1) {+ // Keep messages up to the specified one (usually the assistant message)+ // and the user message just before it.+ const userMessageIndex = messages+ .slice(0, messageIndex)+ .findLastIndex(m => m.role === 'user')+ if (userMessageIndex !== -1) {+ const trimmedMessages = messages.slice(0, userMessageIndex + 1)+ setMessages(trimmedMessages)+ // Reload the conversation+ return await reload(options)+ }+ }+ // If message or preceding user message not found, perform a normal reload+ return await reload(options)+ }+const onSubmit = (e: React.FormEvent<HTMLFormElement>) => {e.preventDefault()setData(undefined) // reset data to clear tool call@@ -126,6 +151,7 @@ export function Chat({addToolResult={addToolResult}anchorRef={anchorRef}onUpdateMessage={handleUpdateAndReloadMessage}+ reload={handleReloadFrom}/><ChatPanelinput={input}diff --git a/components/message-actions.tsx b/components/message-actions.tsxindex ac0d520f..afce5b46 100644--- a/components/message-actions.tsx+++ b/components/message-actions.tsx@@ -1,15 +1,16 @@'use client'-import { CHAT_ID } from '@/lib/constants'import { cn } from '@/lib/utils'-import { useChat } from 'ai/react'import { Copy } from 'lucide-react'import { toast } from 'sonner'import { ChatShare } from './chat-share'+import { RetryButton } from './retry-button'import { Button } from './ui/button'interface MessageActionsProps {message: string+ messageId: string+ reload?: () => Promise<string | null | undefined>chatId?: stringenableShare?: booleanclassName?: string@@ -17,24 +18,20 @@ interface MessageActionsProps {export function MessageActions({message,+ messageId,+ reload,chatId,enableShare,className}: MessageActionsProps) {- const { isLoading } = useChat({- id: CHAT_ID- })async function handleCopy() {await navigator.clipboard.writeText(message)toast.success('Message copied to clipboard')}- if (isLoading) {- return <div className="size-10" />- }-return (<div className={cn('flex items-center gap-0.5 self-end', className)}>+ {reload && <RetryButton reload={reload} messageId={messageId} />}<Buttonvariant="ghost"size="icon"diff --git a/components/render-message.tsx b/components/render-message.tsxindex a15103e7..827c0ac8 100644--- a/components/render-message.tsx+++ b/components/render-message.tsx@@ -1,4 +1,4 @@-import { JSONValue, Message, ToolInvocation } from 'ai'+import { ChatRequestOptions, JSONValue, Message, ToolInvocation } from 'ai'import { useMemo } from 'react'import { AnswerSection } from './answer-section'import { ReasoningSection } from './reasoning-section'@@ -15,6 +15,10 @@ interface RenderMessageProps {chatId?: stringaddToolResult?: (params: { toolCallId: string; result: any }) => voidonUpdateMessage?: (messageId: string, newContent: string) => Promise<void>+ reload?: (+ messageId: string,+ options?: ChatRequestOptions+ ) => Promise<string | null | undefined>}export function RenderMessage({@@ -25,7 +29,8 @@ export function RenderMessage({onQuerySelect,chatId,addToolResult,- onUpdateMessage+ onUpdateMessage,+ reload}: RenderMessageProps) {const relatedQuestions = useMemo(() =>@@ -141,6 +146,8 @@ export function RenderMessage({onOpenChange={open => onOpenChange(messageId, open)}chatId={chatId}showActions={isLastPart}+ messageId={messageId}+ reload={reload}/>)case 'reasoning':diff --git a/components/retry-button.tsx b/components/retry-button.tsxnew file mode 100644index 00000000..0916e100--- /dev/null+++ b/components/retry-button.tsx@@ -0,0 +1,28 @@+'use client'++import { RotateCcw } from 'lucide-react'+import { Button } from './ui/button'++interface RetryButtonProps {+ reload: () => Promise<string | null | undefined>+ messageId: string+}++export const RetryButton: React.FC<RetryButtonProps> = ({+ reload,+ messageId+}) => {+ return (+ <Button+ className="rounded-full h-8 w-8"+ type="button"+ variant="ghost"+ size="icon"+ onClick={() => reload()}+ aria-label={`Retry from message ${messageId}`}+ >+ <RotateCcw className="w-4 h-4" />+ <span className="sr-only">Retry</span>+ </Button>+ )+}