Skip to content

👋 feat: remove Edge TTS #6885

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.

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 4 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"lodash": "^4.17.21",
"lucide-react": "^0.394.0",
"match-sorter": "^6.3.4",
"msedge-tts": "^2.0.0",
"qrcode.react": "^4.2.0",
"rc-input-number": "^7.4.2",
"react": "^18.2.0",
Expand Down
1 change: 0 additions & 1 deletion client/src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export enum STTEndpoints {

export enum TTSEndpoints {
browser = 'browser',
edge = 'edge',
external = 'external',
}

Expand Down
96 changes: 2 additions & 94 deletions client/src/components/Audio/TTS.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import { useEffect, useMemo } from 'react';
import { useRecoilValue } from 'recoil';
import type { TMessageAudio } from '~/common';
import { useLocalize, useTTSBrowser, useTTSEdge, useTTSExternal } from '~/hooks';
import { VolumeIcon, VolumeMuteIcon, Spinner } from '~/components/svg';
import { useToastContext } from '~/Providers/ToastContext';
import { useLocalize, useTTSBrowser, useTTSExternal } from '~/hooks';
import { VolumeIcon, VolumeMuteIcon, Spinner } from '~/components';
import { logger } from '~/utils';
import store from '~/store';

Expand Down Expand Up @@ -85,97 +84,6 @@ export function BrowserTTS({ isLast, index, messageId, content, className }: TMe
);
}

export function EdgeTTS({ isLast, index, messageId, content, className }: TMessageAudio) {
const localize = useLocalize();
const playbackRate = useRecoilValue(store.playbackRate);
const isBrowserSupported = useMemo(
() => typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported('audio/mpeg'),
[],
);

const { showToast } = useToastContext();
const { toggleSpeech, isSpeaking, isLoading, audioRef } = useTTSEdge({
isLast,
index,
messageId,
content,
});

const renderIcon = (size: string) => {
if (isLoading === true) {
return <Spinner size={size} />;
}

if (isSpeaking === true) {
return <VolumeMuteIcon size={size} />;
}

return <VolumeIcon size={size} />;
};

useEffect(() => {
const messageAudio = document.getElementById(`audio-${messageId}`) as HTMLAudioElement | null;
if (!messageAudio) {
return;
}
if (playbackRate != null && playbackRate > 0 && messageAudio.playbackRate !== playbackRate) {
messageAudio.playbackRate = playbackRate;
}
}, [audioRef, isSpeaking, playbackRate, messageId]);

logger.log(
'MessageAudio: audioRef.current?.src, audioRef.current',
audioRef.current?.src,
audioRef.current,
);

return (
<>
<button
className={className}
onClickCapture={() => {
if (!isBrowserSupported) {
showToast({
message: localize('com_nav_tts_unsupported_error'),
status: 'error',
});
return;
}
if (audioRef.current) {
audioRef.current.muted = false;
}
toggleSpeech();
}}
type="button"
title={isSpeaking === true ? localize('com_ui_stop') : localize('com_ui_read_aloud')}
>
{renderIcon('19')}
</button>
{isBrowserSupported ? (
<audio
ref={audioRef}
controls
preload="none"
controlsList="nodownload nofullscreen noremoteplayback"
style={{
position: 'absolute',
overflow: 'hidden',
display: 'none',
height: '0px',
width: '0px',
}}
src={audioRef.current?.src}
onError={(error) => {
logger.error('Error fetching audio:', error);
}}
id={`audio-${messageId}`}
autoPlay
/>
) : null}
</>
);
}

export function ExternalTTS({ isLast, index, messageId, content, className }: TMessageAudio) {
const localize = useLocalize();
const playbackRate = useRecoilValue(store.playbackRate);
Expand Down
30 changes: 1 addition & 29 deletions client/src/components/Audio/Voices.tsx
Original file line number Diff line number Diff line change
@@ -1,39 +1,11 @@
import React from 'react';
import { useRecoilState } from 'recoil';
import type { Option } from '~/common';
import { useLocalize, useTTSBrowser, useTTSEdge, useTTSExternal } from '~/hooks';
import { useLocalize, useTTSBrowser, useTTSExternal } from '~/hooks';
import { Dropdown } from '~/components/ui';
import { logger } from '~/utils';
import store from '~/store';

export function EdgeVoiceDropdown() {
const localize = useLocalize();
const { voices = [] } = useTTSEdge();
const [voice, setVoice] = useRecoilState(store.voice);

const handleVoiceChange = (newValue?: string | Option) => {
logger.log('Edge Voice changed:', newValue);
const newVoice = typeof newValue === 'string' ? newValue : newValue?.value;
if (newVoice != null) {
return setVoice(newVoice.toString());
}
};

return (
<div className="flex items-center justify-between">
<div>{localize('com_nav_voice_select')}</div>
<Dropdown
key={`edge-voice-dropdown-${voices.length}`}
value={voice ?? ''}
options={voices}
onChange={handleVoiceChange}
sizeClasses="min-w-[200px] !max-w-[400px] [--anchor-max-width:400px]"
testId="EdgeVoiceDropdown"
/>
</div>
);
}

export function BrowserVoiceDropdown() {
const localize = useLocalize();
const { voices = [] } = useTTSBrowser();
Expand Down
3 changes: 1 addition & 2 deletions client/src/components/Chat/Messages/MessageAudio.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { memo } from 'react';
import { useRecoilValue } from 'recoil';
import type { TMessageAudio } from '~/common';
import { BrowserTTS, EdgeTTS, ExternalTTS } from '~/components/Audio/TTS';
import { BrowserTTS, ExternalTTS } from '~/components/Audio/TTS';
import { TTSEndpoints } from '~/common';
import store from '~/store';

function MessageAudio(props: TMessageAudio) {
const engineTTS = useRecoilValue<string>(store.engineTTS);

const TTSComponents = {
[TTSEndpoints.edge]: EdgeTTS,
[TTSEndpoints.browser]: BrowserTTS,
[TTSEndpoints.external]: ExternalTTS,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ const EngineTTSDropdown: React.FC<EngineTTSDropdownProps> = ({ external }) => {
const endpointOptions = external
? [
{ value: 'browser', label: localize('com_nav_browser') },
{ value: 'edge', label: localize('com_nav_edge') },
{ value: 'external', label: localize('com_nav_external') },
]
: [
{ value: 'browser', label: localize('com_nav_browser') },
{ value: 'edge', label: localize('com_nav_edge') },
];
: [{ value: 'browser', label: localize('com_nav_browser') }];

const handleSelect = (value: string) => {
setEngineTTS(value);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import { useRecoilValue } from 'recoil';
import {
EdgeVoiceDropdown,
BrowserVoiceDropdown,
ExternalVoiceDropdown,
} from '~/components/Audio/Voices';
import { BrowserVoiceDropdown, ExternalVoiceDropdown } from '~/components/Audio/Voices';
import store from '~/store';
import { TTSEndpoints } from '~/common';

const voiceDropdownComponentsMap = {
[TTSEndpoints.edge]: EdgeVoiceDropdown,
[TTSEndpoints.browser]: BrowserVoiceDropdown,
[TTSEndpoints.external]: ExternalVoiceDropdown,
};
Expand Down
1 change: 0 additions & 1 deletion client/src/hooks/Audio/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ export { default as useCustomAudioRef } from './useCustomAudioRef';
export { default as usePauseGlobalAudio } from './usePauseGlobalAudio';
export { default as useTTSExternal } from './useTTSExternal';
export { default as useTTSBrowser } from './useTTSBrowser';
export { default as useTTSEdge } from './useTTSEdge';
100 changes: 0 additions & 100 deletions client/src/hooks/Audio/useTTSEdge.ts

This file was deleted.

17 changes: 3 additions & 14 deletions client/src/hooks/Input/useTextToSpeech.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type { Option } from '~/common';
import useTextToSpeechExternal from '~/hooks/Input/useTextToSpeechExternal';
import useTextToSpeechBrowser from '~/hooks/Input/useTextToSpeechBrowser';
import useGetAudioSettings from '~/hooks/Input/useGetAudioSettings';
import useTextToSpeechEdge from '~/hooks/Input/useTextToSpeechEdge';
import useAudioRef from '~/hooks/Audio/useAudioRef';
import { usePauseGlobalAudio } from '../Audio';
import { logger } from '~/utils';
Expand Down Expand Up @@ -40,12 +39,6 @@ const useTextToSpeech = (props?: TUseTextToSpeech) => {
voices: voicesLocal,
} = useTextToSpeechBrowser({ setIsSpeaking });

const {
generateSpeechEdge,
cancelSpeechEdge,
voices: voicesEdge,
} = useTextToSpeechEdge({ setIsSpeaking });

const {
generateSpeechExternal,
cancelSpeech: cancelSpeechExternal,
Expand All @@ -61,26 +54,23 @@ const useTextToSpeech = (props?: TUseTextToSpeech) => {

const generateSpeech = useMemo(() => {
const map = {
edge: generateSpeechEdge,
browser: generateSpeechLocal,
external: generateSpeechExternal,
};

return map[textToSpeechEndpoint];
}, [generateSpeechEdge, generateSpeechExternal, generateSpeechLocal, textToSpeechEndpoint]);
}, [generateSpeechExternal, generateSpeechLocal, textToSpeechEndpoint]);

const cancelSpeech = useMemo(() => {
const map = {
edge: cancelSpeechEdge,
browser: cancelSpeechLocal,
external: cancelSpeechExternal,
};
return map[textToSpeechEndpoint];
}, [cancelSpeechEdge, cancelSpeechExternal, cancelSpeechLocal, textToSpeechEndpoint]);
}, [cancelSpeechExternal, cancelSpeechLocal, textToSpeechEndpoint]);

const isLoading = useMemo(() => {
const map = {
edge: false,
browser: false,
external: isLoadingExternal,
};
Expand All @@ -89,13 +79,12 @@ const useTextToSpeech = (props?: TUseTextToSpeech) => {

const voices: Option[] | string[] = useMemo(() => {
const voiceMap = {
edge: voicesEdge,
browser: voicesLocal,
external: voicesExternal,
};

return voiceMap[textToSpeechEndpoint];
}, [textToSpeechEndpoint, voicesEdge, voicesExternal, voicesLocal]);
}, [textToSpeechEndpoint, voicesExternal, voicesLocal]);

useEffect(() => {
const firstVoice = voices[0];
Expand Down
Loading