@@ -31,6 +31,7 @@ import {
3131 MicIcon ,
3232 RefreshCwIcon ,
3333 StarIcon ,
34+ SlidersHorizontalIcon ,
3435 Trash2Icon ,
3536 XIcon ,
3637} from "lucide-react" ;
@@ -65,13 +66,27 @@ import { Badge } from "../ui/badge";
6566import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
6667import { Button } from "../ui/button" ;
6768import { Input } from "../ui/input" ;
69+ import { InputGroup , InputGroupAddon , InputGroupInput } from "../ui/input-group" ;
70+ import {
71+ Menu ,
72+ MenuCheckboxItem ,
73+ MenuGroup ,
74+ MenuGroupLabel ,
75+ MenuPopup ,
76+ MenuRadioGroup ,
77+ MenuRadioItem ,
78+ MenuRadioItemIndicator ,
79+ MenuSeparator ,
80+ MenuTrigger ,
81+ } from "../ui/menu" ;
6882import { Select , SelectItem , SelectPopup , SelectTrigger , SelectValue } from "../ui/select" ;
6983import { Switch } from "../ui/switch" ;
7084import { Textarea } from "../ui/textarea" ;
7185import { toastManager } from "../ui/toast" ;
7286import { MicrophoneTest } from "./MicrophoneTest" ;
7387import { LanguageRow , ModelBenchmarks , orderSpeechLanguages } from "./SpeechModelComparison" ;
7488import { languageLabel , SpeechLanguageSelect } from "./SpeechLanguageSelect" ;
89+ import { filterSpeechModels , type SpeechModelSort } from "./speechModelBrowser" ;
7590import { AdvancedSettings } from "./AdvancedSettings" ;
7691import {
7792 SETTINGS_PICKER_TRIGGER_CLASSNAME ,
@@ -110,12 +125,6 @@ const spellingsOf = (words: SpeechCustomWords) =>
110125 [ term , ...aliases ] . map ( ( spelling ) => spelling . toLocaleLowerCase ( ) ) ,
111126 ) ,
112127 ) ;
113- const modelSortOrder = ( model : EnvironmentSpeechModel ) => {
114- if ( model . active ) return 0 ;
115- if ( model . state === "installed" ) return 1 ;
116- if ( model . state === "downloading" || model . state === "verifying" ) return 2 ;
117- return model . recommended ? 3 : 4 ;
118- } ;
119128
120129type ModelCardProps = {
121130 readonly model : EnvironmentSpeechModel ;
@@ -717,6 +726,8 @@ function SpeechModelBrowser(props: {
717726 catalog : { status, models, run, controlsDisabled, canCancel, requestedDownload } ,
718727 } = props ;
719728 const [ search , setSearch ] = useState ( "" ) ;
729+ const [ sort , setSort ] = useState < SpeechModelSort > ( "recommended" ) ;
730+ const [ downloadedOnly , setDownloadedOnly ] = useState ( false ) ;
720731 const [ languageSearch , setLanguageSearch ] = useState ( "" ) ;
721732 const [ selection , setSelection ] = useState < string [ ] | null > ( null ) ;
722733 const preferred = navigator . languages . map ( ( language ) => language . toLowerCase ( ) . split ( "-" ) [ 0 ] ! ) ;
@@ -729,14 +740,20 @@ function SpeechModelBrowser(props: {
729740 ( code ) =>
730741 ! needle || code . includes ( needle ) || languageLabel ( code ) . toLocaleLowerCase ( ) . includes ( needle ) ,
731742 ) ;
732- const query = search . trim ( ) . toLocaleLowerCase ( ) ;
733- const sortedModels = models
734- . filter (
735- ( model ) =>
736- selectedLanguages . every ( ( language ) => model . languages . includes ( language ) ) &&
737- ( ! query || ( model . name + " " + model . description ) . toLocaleLowerCase ( ) . includes ( query ) ) ,
738- )
739- . toSorted ( ( left , right ) => modelSortOrder ( left ) - modelSortOrder ( right ) ) ;
743+ const accuracyLanguage = selectedLanguages [ 0 ] ?? "en" ;
744+ const sortLabels : Record < SpeechModelSort , string > = {
745+ recommended : "Recommended" ,
746+ size : "Smallest download" ,
747+ accuracy : `Best ${ languageLabel ( accuracyLanguage ) } accuracy` ,
748+ speed : "Fastest transcription" ,
749+ } ;
750+ const sortedModels = filterSpeechModels ( models , {
751+ search,
752+ languages : selectedLanguages ,
753+ downloadedOnly,
754+ sort,
755+ accuracyLanguage,
756+ } ) ;
740757 const activeModel = models . find ( ( model ) => model . active ) ;
741758 const renderedModels =
742759 activeModel && ! sortedModels . includes ( activeModel )
@@ -808,13 +825,54 @@ function SpeechModelBrowser(props: {
808825 ? "Models for " + selectedLanguages . map ( languageLabel ) . join ( ", " )
809826 : "All models" }
810827 </ p >
811- < Input
812- size = "compact"
813- aria-label = "Search transcription models"
814- placeholder = "Search models"
815- value = { search }
816- onChange = { ( e ) => setSearch ( e . target . value ) }
817- />
828+ < InputGroup >
829+ < InputGroupInput
830+ size = "compact"
831+ aria-label = "Search transcription models"
832+ placeholder = "Search models"
833+ value = { search }
834+ onChange = { ( e ) => setSearch ( e . target . value ) }
835+ />
836+ < InputGroupAddon align = "inline-end" >
837+ < Menu >
838+ < MenuTrigger
839+ render = { < Button size = "compact" variant = "ghost-muted" /> }
840+ aria-label = { `Sort and filter models: ${ sortLabels [ sort ] } ${ downloadedOnly ? ", downloaded only" : "" } ` }
841+ >
842+ < SlidersHorizontalIcon />
843+ < span className = "hidden @min-[40rem]/voice-models:inline" >
844+ { sortLabels [ sort ] }
845+ </ span >
846+ { downloadedOnly && < span > 1</ span > }
847+ </ MenuTrigger >
848+ < MenuPopup align = "end" >
849+ < MenuGroup >
850+ < MenuGroupLabel > Sort by</ MenuGroupLabel >
851+ < MenuRadioGroup
852+ value = { sort }
853+ onValueChange = { ( value ) => setSort ( value as SpeechModelSort ) }
854+ >
855+ { ( Object . keys ( sortLabels ) as SpeechModelSort [ ] ) . map ( ( value ) => (
856+ < MenuRadioItem key = { value } value = { value } closeOnClick >
857+ < span className = "flex items-center justify-between gap-3" >
858+ { sortLabels [ value ] }
859+ < MenuRadioItemIndicator />
860+ </ span >
861+ </ MenuRadioItem >
862+ ) ) }
863+ </ MenuRadioGroup >
864+ </ MenuGroup >
865+ < MenuSeparator />
866+ < MenuCheckboxItem
867+ checked = { downloadedOnly }
868+ onCheckedChange = { setDownloadedOnly }
869+ >
870+ Downloaded only
871+ </ MenuCheckboxItem >
872+ </ MenuPopup >
873+ </ Menu >
874+ </ InputGroupAddon >
875+ </ InputGroup >
818876 </ div >
819877 < div
820878 className = "h-72 overflow-y-auto divide-y divide-border/60"
0 commit comments