mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-07-15 00:11:15 +03:00
chat tweaks
- add page title - scroll if near bottom - add tool call group that dynamically updates as tool calls are made - add bouncing loading indicator and other UI polish
This commit is contained in:
parent
6a23060cc5
commit
a292920813
@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"documentTitle": "Chat - Frigate",
|
||||||
"title": "Frigate Chat",
|
"title": "Frigate Chat",
|
||||||
"subtitle": "Your AI assistant for camera management and insights",
|
"subtitle": "Your AI assistant for camera management and insights",
|
||||||
"placeholder": "Ask anything...",
|
"placeholder": "Ask anything...",
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { useState, useEffect, useRef } from "react";
|
import { useState, useEffect, useRef, useCallback } from "react";
|
||||||
import ReactMarkdown from "react-markdown";
|
import ReactMarkdown from "react-markdown";
|
||||||
import remarkGfm from "remark-gfm";
|
import remarkGfm from "remark-gfm";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@ -6,6 +6,7 @@ import copy from "copy-to-clipboard";
|
|||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { FaCopy, FaPencilAlt } from "react-icons/fa";
|
import { FaCopy, FaPencilAlt } from "react-icons/fa";
|
||||||
import { FaArrowUpLong } from "react-icons/fa6";
|
import { FaArrowUpLong } from "react-icons/fa6";
|
||||||
|
import { LuCheck } from "react-icons/lu";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
import {
|
import {
|
||||||
@ -50,13 +51,17 @@ export function MessageBubble({
|
|||||||
}
|
}
|
||||||
}, [isEditing]);
|
}, [isEditing]);
|
||||||
|
|
||||||
const handleCopy = () => {
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
const handleCopy = useCallback(() => {
|
||||||
const text = content?.trim() || "";
|
const text = content?.trim() || "";
|
||||||
if (!text) return;
|
if (!text) return;
|
||||||
if (copy(text)) {
|
if (copy(text)) {
|
||||||
|
setCopied(true);
|
||||||
toast.success(t("button.copiedToClipboard", { ns: "common" }));
|
toast.success(t("button.copiedToClipboard", { ns: "common" }));
|
||||||
|
setTimeout(() => setCopied(false), 2000);
|
||||||
}
|
}
|
||||||
};
|
}, [content, t]);
|
||||||
|
|
||||||
const handleEditClick = () => {
|
const handleEditClick = () => {
|
||||||
setDraftContent(content);
|
setDraftContent(content);
|
||||||
@ -93,7 +98,7 @@ export function MessageBubble({
|
|||||||
value={draftContent}
|
value={draftContent}
|
||||||
onChange={(e) => setDraftContent(e.target.value)}
|
onChange={(e) => setDraftContent(e.target.value)}
|
||||||
onKeyDown={handleEditKeyDown}
|
onKeyDown={handleEditKeyDown}
|
||||||
className="min-h-[80px] w-full resize-y rounded-lg bg-primary px-3 py-2 text-primary-foreground placeholder:text-primary-foreground/60"
|
className="min-h-[80px] w-full resize-y rounded-2xl bg-primary px-4 py-3 text-primary-foreground placeholder:text-primary-foreground/60"
|
||||||
placeholder={t("placeholder")}
|
placeholder={t("placeholder")}
|
||||||
rows={3}
|
rows={3}
|
||||||
/>
|
/>
|
||||||
@ -124,44 +129,49 @@ export function MessageBubble({
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"flex flex-col gap-1",
|
"flex max-w-[85%] flex-col gap-1",
|
||||||
isUser ? "items-end self-end" : "items-start self-start",
|
isUser ? "items-end self-end" : "items-start self-start",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"rounded-lg px-3 py-2",
|
"rounded-2xl px-4 py-3",
|
||||||
isUser ? "bg-primary text-primary-foreground" : "bg-muted",
|
isUser ? "bg-primary text-primary-foreground" : "bg-muted",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{isUser ? (
|
{isUser ? (
|
||||||
content
|
content
|
||||||
) : (
|
) : (
|
||||||
<ReactMarkdown
|
<>
|
||||||
remarkPlugins={[remarkGfm]}
|
<ReactMarkdown
|
||||||
components={{
|
remarkPlugins={[remarkGfm]}
|
||||||
table: ({ node: _n, ...props }) => (
|
components={{
|
||||||
<table
|
table: ({ node: _n, ...props }) => (
|
||||||
className="my-2 w-full border-collapse border border-border"
|
<table
|
||||||
{...props}
|
className="my-2 w-full border-collapse border border-border"
|
||||||
/>
|
{...props}
|
||||||
),
|
/>
|
||||||
th: ({ node: _n, ...props }) => (
|
),
|
||||||
<th
|
th: ({ node: _n, ...props }) => (
|
||||||
className="border border-border bg-muted/50 px-2 py-1 text-left text-sm font-medium"
|
<th
|
||||||
{...props}
|
className="border border-border bg-muted/50 px-2 py-1 text-left text-sm font-medium"
|
||||||
/>
|
{...props}
|
||||||
),
|
/>
|
||||||
td: ({ node: _n, ...props }) => (
|
),
|
||||||
<td
|
td: ({ node: _n, ...props }) => (
|
||||||
className="border border-border px-2 py-1 text-sm"
|
<td
|
||||||
{...props}
|
className="border border-border px-2 py-1 text-sm"
|
||||||
/>
|
{...props}
|
||||||
),
|
/>
|
||||||
}}
|
),
|
||||||
>
|
}}
|
||||||
{content}
|
>
|
||||||
</ReactMarkdown>
|
{content}
|
||||||
|
</ReactMarkdown>
|
||||||
|
{!isComplete && (
|
||||||
|
<span className="ml-1 inline-block h-4 w-0.5 animate-pulse bg-foreground align-middle" />
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-0.5">
|
<div className="flex items-center gap-0.5">
|
||||||
@ -194,7 +204,11 @@ export function MessageBubble({
|
|||||||
disabled={!content?.trim()}
|
disabled={!content?.trim()}
|
||||||
aria-label={t("button.copy", { ns: "common" })}
|
aria-label={t("button.copy", { ns: "common" })}
|
||||||
>
|
>
|
||||||
<FaCopy className="size-3" />
|
{copied ? (
|
||||||
|
<LuCheck className="size-3" />
|
||||||
|
) : (
|
||||||
|
<FaCopy className="size-3" />
|
||||||
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>
|
<TooltipContent>
|
||||||
|
|||||||
@ -75,7 +75,7 @@ export function ChatStartingState({ onSendMessage }: ChatStartingStateProps) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex w-full max-w-2xl flex-row items-center gap-2 rounded-xl bg-secondary p-4">
|
<div className="flex w-full max-w-2xl flex-row items-center gap-2 rounded-xl bg-secondary p-3">
|
||||||
<Input
|
<Input
|
||||||
className="h-12 w-full flex-1 border-transparent bg-transparent text-base shadow-none focus-visible:ring-0 dark:bg-transparent"
|
className="h-12 w-full flex-1 border-transparent bg-transparent text-base shadow-none focus-visible:ring-0 dark:bg-transparent"
|
||||||
placeholder={t("placeholder")}
|
placeholder={t("placeholder")}
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import {
|
|||||||
} from "@/components/ui/collapsible";
|
} from "@/components/ui/collapsible";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { ChevronDown, ChevronRight } from "lucide-react";
|
import { LuChevronDown, LuChevronRight } from "react-icons/lu";
|
||||||
|
|
||||||
type ToolCallBubbleProps = {
|
type ToolCallBubbleProps = {
|
||||||
name: string;
|
name: string;
|
||||||
@ -34,7 +34,7 @@ export function ToolCallBubble({
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"rounded-lg px-3 py-2",
|
"rounded-2xl px-3 py-2",
|
||||||
isLeft
|
isLeft
|
||||||
? "self-start bg-muted"
|
? "self-start bg-muted"
|
||||||
: "self-end bg-primary text-primary-foreground",
|
: "self-end bg-primary text-primary-foreground",
|
||||||
@ -51,9 +51,9 @@ export function ToolCallBubble({
|
|||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{open ? (
|
{open ? (
|
||||||
<ChevronDown size={12} className="shrink-0" />
|
<LuChevronDown className="size-3 shrink-0" />
|
||||||
) : (
|
) : (
|
||||||
<ChevronRight size={12} className="shrink-0" />
|
<LuChevronRight className="size-3 shrink-0" />
|
||||||
)}
|
)}
|
||||||
<span className="break-words font-medium">
|
<span className="break-words font-medium">
|
||||||
{isLeft ? t("call") : t("result")} {normalizedName}
|
{isLeft ? t("call") : t("result")} {normalizedName}
|
||||||
|
|||||||
56
web/src/components/chat/ToolCallsGroup.tsx
Normal file
56
web/src/components/chat/ToolCallsGroup.tsx
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import {
|
||||||
|
Collapsible,
|
||||||
|
CollapsibleContent,
|
||||||
|
CollapsibleTrigger,
|
||||||
|
} from "@/components/ui/collapsible";
|
||||||
|
import { LuChevronDown, LuChevronRight } from "react-icons/lu";
|
||||||
|
import { ToolCallBubble } from "@/components/chat/ToolCallBubble";
|
||||||
|
import type { ToolCall } from "@/types/chat";
|
||||||
|
|
||||||
|
type ToolCallsGroupProps = {
|
||||||
|
toolCalls: ToolCall[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export function ToolCallsGroup({ toolCalls }: ToolCallsGroupProps) {
|
||||||
|
const { t } = useTranslation(["views/chat"]);
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
if (toolCalls.length === 0) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Collapsible open={open} onOpenChange={setOpen}>
|
||||||
|
<CollapsibleTrigger className="flex items-center gap-1 rounded-md px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-muted/50">
|
||||||
|
{open ? (
|
||||||
|
<LuChevronDown className="size-3" />
|
||||||
|
) : (
|
||||||
|
<LuChevronRight className="size-3" />
|
||||||
|
)}
|
||||||
|
<span>
|
||||||
|
{open ? t("hideTools") : t("showTools", { count: toolCalls.length })}
|
||||||
|
</span>
|
||||||
|
</CollapsibleTrigger>
|
||||||
|
<CollapsibleContent>
|
||||||
|
<div className="mt-1 flex flex-col gap-2">
|
||||||
|
{toolCalls.map((tc, tcIdx) => (
|
||||||
|
<div key={tcIdx} className="flex flex-col gap-2">
|
||||||
|
<ToolCallBubble
|
||||||
|
name={tc.name}
|
||||||
|
arguments={tc.arguments}
|
||||||
|
side="left"
|
||||||
|
/>
|
||||||
|
{tc.response && (
|
||||||
|
<ToolCallBubble
|
||||||
|
name={tc.name}
|
||||||
|
response={tc.response}
|
||||||
|
side="right"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</CollapsibleContent>
|
||||||
|
</Collapsible>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -1,12 +1,13 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { FaArrowUpLong } from "react-icons/fa6";
|
import { FaArrowUpLong } from "react-icons/fa6";
|
||||||
|
import { LuCircleAlert } from "react-icons/lu";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { useState, useCallback } from "react";
|
import { useState, useCallback, useRef, useEffect } from "react";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { ChatEventThumbnailsRow } from "@/components/chat/ChatEventThumbnailsRow";
|
import { ChatEventThumbnailsRow } from "@/components/chat/ChatEventThumbnailsRow";
|
||||||
import { MessageBubble } from "@/components/chat/ChatMessage";
|
import { MessageBubble } from "@/components/chat/ChatMessage";
|
||||||
import { ToolCallBubble } from "@/components/chat/ToolCallBubble";
|
import { ToolCallsGroup } from "@/components/chat/ToolCallsGroup";
|
||||||
import { ChatStartingState } from "@/components/chat/ChatStartingState";
|
import { ChatStartingState } from "@/components/chat/ChatStartingState";
|
||||||
import type { ChatMessage } from "@/types/chat";
|
import type { ChatMessage } from "@/types/chat";
|
||||||
import {
|
import {
|
||||||
@ -20,6 +21,21 @@ export default function ChatPage() {
|
|||||||
const [messages, setMessages] = useState<ChatMessage[]>([]);
|
const [messages, setMessages] = useState<ChatMessage[]>([]);
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.title = t("documentTitle");
|
||||||
|
}, [t]);
|
||||||
|
|
||||||
|
// Auto-scroll to bottom when messages change, but only if near bottom
|
||||||
|
useEffect(() => {
|
||||||
|
const el = scrollRef.current;
|
||||||
|
if (!el) return;
|
||||||
|
const isNearBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 150;
|
||||||
|
if (isNearBottom) {
|
||||||
|
el.scrollTo({ top: el.scrollHeight, behavior: "smooth" });
|
||||||
|
}
|
||||||
|
}, [messages]);
|
||||||
|
|
||||||
const submitConversation = useCallback(
|
const submitConversation = useCallback(
|
||||||
async (messagesToSend: ChatMessage[]) => {
|
async (messagesToSend: ChatMessage[]) => {
|
||||||
@ -77,7 +93,7 @@ export default function ChatPage() {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex size-full justify-center p-2">
|
<div className="flex size-full justify-center p-2 md:p-4">
|
||||||
<div className="flex size-full flex-col xl:w-[50%] 3xl:w-[35%]">
|
<div className="flex size-full flex-col xl:w-[50%] 3xl:w-[35%]">
|
||||||
{messages.length === 0 ? (
|
{messages.length === 0 ? (
|
||||||
<ChatStartingState
|
<ChatStartingState
|
||||||
@ -87,83 +103,83 @@ export default function ChatPage() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<div className="scrollbar-container flex min-h-0 w-full flex-1 flex-col gap-2 overflow-y-auto">
|
<>
|
||||||
{messages.map((msg, i) => {
|
<div
|
||||||
const isStreamingPlaceholder =
|
ref={scrollRef}
|
||||||
i === messages.length - 1 &&
|
className="scrollbar-container flex min-h-0 w-full flex-1 flex-col gap-3 overflow-y-auto"
|
||||||
msg.role === "assistant" &&
|
>
|
||||||
isLoading &&
|
{messages.map((msg, i) => {
|
||||||
!msg.content?.trim() &&
|
const isLastAssistant =
|
||||||
!(msg.toolCalls && msg.toolCalls.length > 0);
|
i === messages.length - 1 && msg.role === "assistant";
|
||||||
if (isStreamingPlaceholder) {
|
const isComplete =
|
||||||
return <div key={i} />;
|
msg.role === "user" || !isLoading || !isLastAssistant;
|
||||||
}
|
const hasToolCalls = msg.toolCalls && msg.toolCalls.length > 0;
|
||||||
return (
|
const hasContent = !!msg.content?.trim();
|
||||||
<div key={i} className="flex flex-col gap-2">
|
const showProcessing =
|
||||||
{msg.role === "assistant" && msg.toolCalls && (
|
isLastAssistant && isLoading && !hasContent;
|
||||||
<>
|
|
||||||
{msg.toolCalls.map((tc, tcIdx) => (
|
// Hide empty placeholder only when there are no tool calls yet
|
||||||
<div key={tcIdx} className="flex flex-col gap-2">
|
if (
|
||||||
<ToolCallBubble
|
isLastAssistant &&
|
||||||
name={tc.name}
|
isLoading &&
|
||||||
arguments={tc.arguments}
|
!hasContent &&
|
||||||
side="left"
|
!hasToolCalls
|
||||||
/>
|
)
|
||||||
{tc.response && (
|
return (
|
||||||
<ToolCallBubble
|
<div
|
||||||
name={tc.name}
|
key={i}
|
||||||
response={tc.response}
|
className="flex items-center gap-2 self-start rounded-2xl bg-muted px-5 py-4"
|
||||||
side="right"
|
>
|
||||||
/>
|
<span className="size-2.5 animate-bounce rounded-full bg-muted-foreground/60 [animation-delay:-0.32s]" />
|
||||||
)}
|
<span className="size-2.5 animate-bounce rounded-full bg-muted-foreground/60 [animation-delay:-0.16s]" />
|
||||||
</div>
|
<span className="size-2.5 animate-bounce rounded-full bg-muted-foreground/60" />
|
||||||
))}
|
</div>
|
||||||
</>
|
);
|
||||||
)}
|
|
||||||
<MessageBubble
|
return (
|
||||||
role={msg.role}
|
<div key={i} className="flex flex-col gap-2">
|
||||||
content={msg.content}
|
{msg.role === "assistant" && hasToolCalls && (
|
||||||
messageIndex={i}
|
<ToolCallsGroup toolCalls={msg.toolCalls!} />
|
||||||
onEditSubmit={
|
)}
|
||||||
msg.role === "user" ? handleEditSubmit : undefined
|
{showProcessing ? (
|
||||||
}
|
<div className="flex items-center gap-2 self-start rounded-2xl bg-muted px-5 py-4">
|
||||||
isComplete={
|
<span className="size-2 animate-bounce rounded-full bg-muted-foreground/60 [animation-delay:-0.3s]" />
|
||||||
msg.role === "user" ||
|
<span className="size-2 animate-bounce rounded-full bg-muted-foreground/60 [animation-delay:-0.15s]" />
|
||||||
!isLoading ||
|
<span className="size-2 animate-bounce rounded-full bg-muted-foreground/60" />
|
||||||
i < messages.length - 1
|
</div>
|
||||||
}
|
) : (
|
||||||
/>
|
<MessageBubble
|
||||||
{msg.role === "assistant" &&
|
role={msg.role}
|
||||||
(() => {
|
content={msg.content}
|
||||||
const isComplete = !isLoading || i < messages.length - 1;
|
messageIndex={i}
|
||||||
if (!isComplete) return null;
|
onEditSubmit={
|
||||||
const events = getEventIdsFromSearchObjectsToolCalls(
|
msg.role === "user" ? handleEditSubmit : undefined
|
||||||
msg.toolCalls,
|
}
|
||||||
);
|
isComplete={isComplete}
|
||||||
return <ChatEventThumbnailsRow events={events} />;
|
/>
|
||||||
})()}
|
)}
|
||||||
</div>
|
{msg.role === "assistant" &&
|
||||||
);
|
isComplete &&
|
||||||
})}
|
(() => {
|
||||||
{(() => {
|
const events = getEventIdsFromSearchObjectsToolCalls(
|
||||||
const lastMsg = messages[messages.length - 1];
|
msg.toolCalls,
|
||||||
const showProcessing =
|
);
|
||||||
isLoading &&
|
return <ChatEventThumbnailsRow events={events} />;
|
||||||
lastMsg?.role === "assistant" &&
|
})()}
|
||||||
!lastMsg.content?.trim() &&
|
</div>
|
||||||
!(lastMsg.toolCalls && lastMsg.toolCalls.length > 0);
|
);
|
||||||
return showProcessing ? (
|
})}
|
||||||
<div className="self-start rounded-lg bg-muted px-3 py-2 text-muted-foreground">
|
{error && (
|
||||||
{t("processing")}
|
<p
|
||||||
</div>
|
className="flex items-center gap-1.5 self-start text-sm text-destructive"
|
||||||
) : null;
|
role="alert"
|
||||||
})()}
|
>
|
||||||
{error && (
|
<LuCircleAlert className="size-3.5 shrink-0" />
|
||||||
<p className="self-start text-sm text-destructive" role="alert">
|
{error}
|
||||||
{error}
|
</p>
|
||||||
</p>
|
)}
|
||||||
)}
|
</div>
|
||||||
</div>
|
</>
|
||||||
)}
|
)}
|
||||||
{messages.length > 0 && (
|
{messages.length > 0 && (
|
||||||
<ChatEntry
|
<ChatEntry
|
||||||
@ -202,7 +218,7 @@ function ChatEntry({
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex w-full flex-col items-center justify-center rounded-xl bg-secondary p-2">
|
<div className="mt-2 flex w-full flex-col items-center justify-center rounded-xl bg-secondary p-3">
|
||||||
<div className="flex w-full flex-row items-center gap-2">
|
<div className="flex w-full flex-row items-center gap-2">
|
||||||
<Input
|
<Input
|
||||||
className="w-full flex-1 border-transparent bg-transparent shadow-none focus-visible:ring-0 dark:bg-transparent"
|
className="w-full flex-1 border-transparent bg-transparent shadow-none focus-visible:ring-0 dark:bg-transparent"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user