Skip to content

speech state #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2024
Merged

speech state #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996b892
speech state
prakriti-solankey Jun 13, 2024
d6379fc
Button Details changes
prakriti-solankey Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions frontend/src/components/ButtonWithToolTip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const ButtonWithToolTip = ({
className = '',
label,
loading,
fill = 'filled',
}: {
text: string | React.ReactNode;
children: React.ReactNode;
Expand All @@ -23,6 +24,7 @@ const ButtonWithToolTip = ({
className?: string;
loading?: boolean;
label: string;
fill?: 'filled' | 'outlined' | 'text';
}) => {
return (
<Tip allowedPlacements={[placement]}>
Expand All @@ -34,6 +36,7 @@ const ButtonWithToolTip = ({
disabled={disabled}
className={className}
loading={loading}
fill={fill}
>
{children}
</Button>
Expand Down
110 changes: 61 additions & 49 deletions frontend/src/components/Chatbot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import ReactMarkdown from 'react-markdown';
import IconButtonWithToolTip from './IconButtonToolTip';
import { buttonCaptions, tooltips } from '../utils/Constants';
import useSpeechSynthesis from '../hooks/useSpeech';
import ButtonWithToolTip from './ButtonWithToolTip';

const Chatbot: React.FC<ChatbotProps> = (props) => {
const { messages: listMessages, setMessages: setListMessages, isLoading, isFullScreen } = props;
const { messages: listMessages, setMessages: setListMessages, isLoading, isFullScreen, clear } = props;
const [inputMessage, setInputMessage] = useState('');
const [loading, setLoading] = useState<boolean>(isLoading);
const { userCredentials } = useCredentials();
Expand Down Expand Up @@ -179,6 +180,13 @@ const Chatbot: React.FC<ChatbotProps> = (props) => {
setLoading(() => listMessages.some((msg) => msg.isLoading || msg.isTyping));
}, [listMessages]);

useEffect(() => {
if (clear) {
cancel();
setListMessages((msgs) => msgs.map((msg) => ({ ...msg, speaking: false })));
}
}, [clear]);

const handleCopy = (message: string, id: number) => {
copy(message);
setListMessages((msgs) =>
Expand Down Expand Up @@ -276,66 +284,70 @@ const Chatbot: React.FC<ChatbotProps> = (props) => {
{chat.datetime}
</Typography>
</div>
{((chat.user === 'chatbot' && chat.id !== 2 && chat.sources?.length !== 0) || chat.isLoading) && (
<div className='flex'>
<IconButtonWithToolTip
placement='top'
clean
text='Retrieval Information'
label='Retrieval Information'
disabled={chat.isTyping || chat.isLoading}
onClick={() => {
setModelModal(chat.model ?? '');
setSourcesModal(chat.sources ?? []);
setResponseTime(chat.response_time ?? 0);
setChunkModal(chat.chunk_ids ?? []);
setTokensUsed(chat.total_tokens ?? 0);
setShowInfoModal(true);
}}
>
<InformationCircleIconOutline className='w-4 h-4 inline-block' />
</IconButtonWithToolTip>
<IconButtonWithToolTip
label='copy text'
placement='top'
clean
text={chat.copying ? tooltips.copied : tooltips.copy}
onClick={() => handleCopy(chat.message, chat.id)}
disabled={chat.isTyping || chat.isLoading}
>
<ClipboardDocumentIconOutline className='w-4 h-4 inline-block' />
</IconButtonWithToolTip>
{copyMessageId === chat.id && (
<>
<span className='pt-4 text-xs'>Copied!</span>
<span style={{ display: 'none' }}>{value}</span>
</>
)}
{supported && chat.speaking ? (
{chat.user === 'chatbot' &&
chat.id !== 2 &&
chat.sources?.length !== 0 &&
!chat.isLoading &&
!chat.isTyping && (
<div className='flex inline-block'>
<ButtonWithToolTip
className='w-4 h-4 inline-block p-6 mt-1.5'
fill='text'
placement='top'
clean
text='Retrieval Information'
label='Retrieval Information'
disabled={chat.isTyping || chat.isLoading}
onClick={() => {
setModelModal(chat.model ?? '');
setSourcesModal(chat.sources ?? []);
setResponseTime(chat.response_time ?? 0);
setChunkModal(chat.chunk_ids ?? []);
setTokensUsed(chat.total_tokens ?? 0);
setShowInfoModal(true);
}}
>
{' '}
{buttonCaptions.details}
</ButtonWithToolTip>
<IconButtonWithToolTip
label='copy text'
placement='top'
label='text to speak'
clean
onClick={() => handleCancel(chat.id)}
text={chat.speaking ? tooltips.stopSpeaking : tooltips.textTospeech}
text={chat.copying ? tooltips.copied : tooltips.copy}
onClick={() => handleCopy(chat.message, chat.id)}
disabled={chat.isTyping || chat.isLoading}
>
<SpeakerXMarkIconOutline className='w-4 h-4 inline-block' />
<ClipboardDocumentIconOutline className='w-4 h-4 inline-block' />
</IconButtonWithToolTip>
) : (
{copyMessageId === chat.id && (
<>
<span className='pt-4 text-xs'>Copied!</span>
<span style={{ display: 'none' }}>{value}</span>
</>
)}
<IconButtonWithToolTip
placement='top'
clean
onClick={() => handleSpeak(chat.message, chat.id)}
onClick={() => {
if (chat.speaking) {
handleCancel(chat.id);
} else {
handleSpeak(chat.message, chat.id);
}
}}
text={chat.speaking ? tooltips.stopSpeaking : tooltips.textTospeech}
disabled={chat.isTyping || chat.isLoading}
label='speech'
disabled={listMessages.some((msg) => msg.speaking && msg.id !== chat.id)}
label={chat.speaking ? 'stop speaking' : 'text to speech'}
>
<SpeakerWaveIconOutline className='w-4 h-4 inline-block' />
{chat.speaking ? (
<SpeakerXMarkIconOutline className='w-4 h-4 inline-block' />
) : (
<SpeakerWaveIconOutline className='w-4 h-4 inline-block' />
)}
</IconButtonWithToolTip>
)}
</div>
)}
</div>
)}
</div>
</Widget>
</div>
Expand Down
7 changes: 2 additions & 5 deletions frontend/src/components/HoverableLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import React, { useState, useEffect, useRef } from 'react';
import { HoverableLinkProps } from '../types';

const HoverableLink: React.FC<HoverableLinkProps> = ({ url, children }) => {
const [hovering, setHovering] = useState(false);
const [iframeSrc, setIframeSrc] = useState<string>('');
const [mousePosition, setMousePosition] = useState({ x: 0, y: 0 });
const popupRef = useRef<HTMLDivElement>(null);

useEffect(() => {
let timer: NodeJS.Timeout;
if (hovering) {
Expand Down Expand Up @@ -44,9 +42,7 @@ const HoverableLink: React.FC<HoverableLinkProps> = ({ url, children }) => {
onMouseMove={handleMouseMove}
onMouseLeave={handleMouseLeave}
>
<a href={url} target='_blank' rel='noopener noreferrer'>
{children}
</a>
{children}
{hovering && (
<div
className='popup'
Expand All @@ -68,6 +64,7 @@ const HoverableLink: React.FC<HoverableLinkProps> = ({ url, children }) => {
)}
</div>
)}
<a href={url} target='_blank' rel='noopener noreferrer' />
</div>
);
};
Expand Down
Loading