Skip to content

Sync selected mode with URL query param for ASR, Chat and TTS #267

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

Open
RenukaPatil07 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Sync selected mode with URL query param for ASR, Chat and TTS #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 30 additions & 23 deletions src/features/asr/components/ModelSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
import { setSelectedMode, setSelectedModels, setActiveSession, resetLanguageSettings } from '../store/chatSlice';
import { ModeDropdown } from './ModeDropdown';
import { ModelDropdown } from './ModelDropdown';
Expand All @@ -11,6 +11,7 @@ export function ModelSelector({ variant = 'full' }) {
const dispatch = useDispatch();
const navigate = useNavigate();
const { tenant: urlTenant } = useParams();
const [searchParams, setSearchParams] = useSearchParams();
const { tenant: contextTenant } = useTenant();
const currentTenant = urlTenant || contextTenant;
const { activeSession, selectedMode, selectedModels } = useSelector((state) => state.asrChat);
Expand All @@ -26,7 +27,12 @@ export function ModelSelector({ variant = 'full' }) {
modelA: activeSession?.model_a?.id || selectedModels?.modelA,
modelB: activeSession?.model_b?.id || selectedModels?.modelB,
};

useEffect(() => {
const modeFromURL = searchParams.get('mode');
if (modeFromURL && modeFromURL !== selectedMode) {
dispatch(setSelectedMode(modeFromURL));
}
}, []);
useEffect(() => {
if (models.length > 0 && !activeSession) {
const currentSelections = { ...selectedModels };
Expand Down Expand Up @@ -69,17 +75,18 @@ export function ModelSelector({ variant = 'full' }) {
}, [models, mode, activeSession, selectedModels, dispatch]);

const handleModeChange = (newMode) => {
dispatch(setSelectedMode(newMode));
if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/asr`);
} else {
navigate('/asr');
}
}
};
dispatch(setSelectedMode(newMode));


searchParams.set('mode', newMode);
setSearchParams(searchParams);

if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
navigate(currentTenant ? `/${currentTenant}/chat?mode=${newMode}` : `/chat?mode=${newMode}`);
}
};

const handleModelSelect = (model, slot) => {
const newModels = { ...modelsInUse };
Expand All @@ -96,16 +103,16 @@ export function ModelSelector({ variant = 'full' }) {
dispatch(setSelectedModels(newModels));

if (isChangingActiveSessionModel) {
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/asr`);
} else {
navigate('/asr');
}
}
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());


navigate(currentTenant ? `/${currentTenant}/chat?mode=${currentMode}` : `/chat?mode=${currentMode}`);
searchParams.set('mode', currentMode);
setSearchParams(searchParams);
}
};

if (loading || (models.length > 0 && !modelsInUse.modelA && mode !== 'random' && mode !== 'synthetic_asr_data')) {
Expand Down
53 changes: 31 additions & 22 deletions src/features/chat/components/ModelSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
import { setSelectedMode, setSelectedModels, setActiveSession, resetLanguageSettings } from '../store/chatSlice';
import { ModeDropdown } from './ModeDropdown';
import { ModelDropdown } from './ModelDropdown';
Expand All @@ -11,6 +11,7 @@ export function ModelSelector({ variant = 'full' }) {
const dispatch = useDispatch();
const navigate = useNavigate();
const { tenant: urlTenant } = useParams();
const [searchParams, setSearchParams] = useSearchParams();
const { tenant: contextTenant } = useTenant();
const currentTenant = urlTenant || contextTenant;
const { activeSession, selectedMode, selectedModels } = useSelector((state) => state.chat);
Expand Down Expand Up @@ -67,19 +68,26 @@ export function ModelSelector({ variant = 'full' }) {
}
}
}, [models, mode, activeSession, selectedModels, dispatch]);
useEffect(() => {
const modeFromURL = searchParams.get('mode');
if (modeFromURL && modeFromURL !== selectedMode) {
dispatch(setSelectedMode(modeFromURL));
}
}, []);

const handleModeChange = (newMode) => {
dispatch(setSelectedMode(newMode));
if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/chat`);
} else {
navigate('/chat');
}
}
};
dispatch(setSelectedMode(newMode));


searchParams.set('mode', newMode);
setSearchParams(searchParams);

if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
navigate(currentTenant ? `/${currentTenant}/chat?mode=${newMode}` : `/chat?mode=${newMode}`);
}
};

const handleModelSelect = (model, slot) => {
const newModels = { ...modelsInUse };
Expand All @@ -96,16 +104,17 @@ export function ModelSelector({ variant = 'full' }) {
dispatch(setSelectedModels(newModels));

if (isChangingActiveSessionModel) {
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/chat`);
} else {
navigate('/chat');
}
}
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());


searchParams.set('mode', currentMode);
setSearchParams(searchParams);

navigate(currentTenant ? `/${currentTenant}/chat?mode=${currentMode}` : `/chat?mode=${currentMode}`);
}
};

if (loading || (models.length > 0 && !modelsInUse.modelA && mode !== 'random')) {
Expand Down
54 changes: 32 additions & 22 deletions src/features/tts/components/ModelSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { setSelectedMode, setSelectedModels, setActiveSession, resetLanguageSettings, setSelectedLanguage } from '../store/chatSlice';
import { getAvailableLanguages, getValidLanguage } from '../utils/languageUtils';
import { useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
import { ModeDropdown } from './ModeDropdown';
import { ModelDropdown } from './ModelDropdown';
import { fetchModelsTTS } from '../../models/store/modelsSlice';
Expand All @@ -12,6 +12,7 @@ export function ModelSelector({ variant = 'full' }) {
const dispatch = useDispatch();
const navigate = useNavigate();
const { tenant: urlTenant } = useParams();
const [searchParams, setSearchParams] = useSearchParams();
const { tenant: contextTenant } = useTenant();
const currentTenant = urlTenant || contextTenant;
const { activeSession, selectedMode, selectedModels, selectedLanguage } = useSelector((state) => state.ttsChat);
Expand Down Expand Up @@ -69,18 +70,26 @@ export function ModelSelector({ variant = 'full' }) {
}
}, [models, mode, activeSession, selectedModels, dispatch]);

useEffect(() => {
const modeFromURL = searchParams.get('mode');
if (modeFromURL && modeFromURL !== selectedMode) {
dispatch(setSelectedMode(modeFromURL));
}
}, []);

const handleModeChange = (newMode) => {
dispatch(setSelectedMode(newMode));
if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/tts`);
} else {
navigate('/tts');
}
}
};
dispatch(setSelectedMode(newMode));


searchParams.set('mode', newMode);
setSearchParams(searchParams);

if (activeSession && activeSession.mode !== newMode) {
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
navigate(currentTenant ? `/${currentTenant}/tts?mode=${newMode}` : `/tts?mode=${newMode}`);
}
};

const handleModelSelect = (model, slot) => {
const newModels = { ...modelsInUse };
Expand Down Expand Up @@ -109,16 +118,17 @@ export function ModelSelector({ variant = 'full' }) {
}

if (isChangingActiveSessionModel) {
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());
if (currentTenant) {
navigate(`/${currentTenant}/tts`);
} else {
navigate('/tts');
}
}
const currentMode = activeSession.mode;
dispatch(setSelectedMode(currentMode));
dispatch(setActiveSession(null));
dispatch(resetLanguageSettings());


searchParams.set('mode', currentMode);
setSearchParams(searchParams);

navigate(currentTenant ? `/${currentTenant}/tts?mode=${currentMode}` : `/tts?mode=${currentMode}`);
}
};

if (loading || (models.length > 0 && !modelsInUse.modelA && mode !== 'random' && mode !== 'academic')) {
Expand Down