The CLI `hermes model` picker shows per-model $/Mtok pricing and gates paid
models on free Nous accounts. The GUI picker showed bare model names. Bring it
to parity across both the model-picker dialog and onboarding confirm card.
Backend:
- inventory.build_models_payload gains a pricing=True flag → _apply_pricing
enriches each provider row with formatted per-model pricing
({input,output,cache,free}) via the same _format_price_per_mtok the CLI uses,
and for Nous adds free_tier + unavailable_models (paid models a free user
can't select) via check_nous_free_tier + partition_nous_models_by_tier.
Best-effort: any pricing/tier failure is swallowed and fails open (no gating).
- /api/model/options and TUI model.options now pass pricing=True so the
global picker and in-session picker both carry pricing.
Frontend:
- ModelOptionProvider gains pricing/free_tier/unavailable_models; new
ModelPricing type.
- model-picker dialog renders In/Out $/Mtok (or a Free pill) per model, a
Free tier/Pro badge on the Nous heading, and disables + grays unavailable
paid models for free users with a 'Pro models need a paid subscription' note.
- onboarding confirm card shows the chosen model's price + tier badge.
Tests: test_inventory_pricing covers price formatting, free-tier gating,
paid no-gating, providers without pricing, and swallowed failures.
286 lines
9.5 KiB
TypeScript
286 lines
9.5 KiB
TypeScript
import { useQuery } from '@tanstack/react-query'
|
|
import { useState } from 'react'
|
|
|
|
import type { ModelOptionProvider, ModelOptionsResponse, ModelPricing } from '@/types/hermes'
|
|
|
|
import type { HermesGateway } from '../hermes'
|
|
import { getGlobalModelOptions } from '../hermes'
|
|
import { cn } from '../lib/utils'
|
|
|
|
import { InlineNotice } from './notifications'
|
|
import { Button } from './ui/button'
|
|
import { Checkbox } from './ui/checkbox'
|
|
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from './ui/command'
|
|
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from './ui/dialog'
|
|
import { Skeleton } from './ui/skeleton'
|
|
|
|
interface ModelPickerDialogProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
gw?: HermesGateway
|
|
sessionId?: string | null
|
|
currentModel: string
|
|
currentProvider: string
|
|
onSelect: (selection: { provider: string; model: string; persistGlobal: boolean }) => void
|
|
/**
|
|
* Optional class to apply to DialogContent. Use to override z-index when
|
|
* stacking the picker on top of another fixed overlay (e.g. the desktop
|
|
* onboarding overlay, which sits at z-1300; the default Dialog z-130 ends
|
|
* up rendering underneath and blocks pointer events).
|
|
*/
|
|
contentClassName?: string
|
|
}
|
|
|
|
export function ModelPickerDialog({
|
|
open,
|
|
onOpenChange,
|
|
gw,
|
|
sessionId,
|
|
currentModel,
|
|
currentProvider,
|
|
onSelect,
|
|
contentClassName
|
|
}: ModelPickerDialogProps) {
|
|
const [persistGlobal, setPersistGlobal] = useState(!sessionId)
|
|
|
|
const modelOptions = useQuery({
|
|
queryKey: ['model-options', sessionId || 'global'],
|
|
queryFn: () => {
|
|
if (gw && sessionId) {
|
|
return gw.request<ModelOptionsResponse>('model.options', {
|
|
session_id: sessionId
|
|
})
|
|
}
|
|
|
|
return getGlobalModelOptions()
|
|
},
|
|
enabled: open
|
|
})
|
|
|
|
const providers = modelOptions.data?.providers ?? []
|
|
const optionsModel = String(modelOptions.data?.model ?? currentModel ?? '')
|
|
const optionsProvider = String(modelOptions.data?.provider ?? currentProvider ?? '')
|
|
const loading = modelOptions.isPending && !modelOptions.data
|
|
|
|
const error = modelOptions.error
|
|
? modelOptions.error instanceof Error
|
|
? modelOptions.error.message
|
|
: String(modelOptions.error)
|
|
: null
|
|
|
|
const selectModel = (provider: ModelOptionProvider, model: string) => {
|
|
onSelect({
|
|
provider: provider.slug,
|
|
model,
|
|
persistGlobal: persistGlobal || !sessionId
|
|
})
|
|
onOpenChange(false)
|
|
}
|
|
|
|
return (
|
|
<Dialog onOpenChange={onOpenChange} open={open}>
|
|
<DialogContent className={cn('max-h-[85vh] max-w-2xl gap-0 overflow-hidden p-0', contentClassName)}>
|
|
<DialogHeader className="border-b border-border px-4 py-3">
|
|
<DialogTitle>Switch model</DialogTitle>
|
|
<DialogDescription className="font-mono text-xs leading-relaxed">
|
|
current: {optionsModel || currentModel || '(unknown)'}
|
|
{optionsProvider || currentProvider ? ` · ${optionsProvider || currentProvider}` : ''}
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
<Command className="rounded-none bg-card">
|
|
<CommandInput autoFocus placeholder="Filter providers and models..." />
|
|
<CommandList className="max-h-96">
|
|
{!loading && !error && <CommandEmpty>No models found.</CommandEmpty>}
|
|
<ModelResults
|
|
currentModel={optionsModel || currentModel}
|
|
currentProvider={optionsProvider || currentProvider}
|
|
error={error}
|
|
loading={loading}
|
|
onSelectModel={selectModel}
|
|
providers={providers}
|
|
/>
|
|
</CommandList>
|
|
</Command>
|
|
|
|
<DialogFooter className="flex-row items-center justify-between gap-3 border-t border-border bg-card p-3 sm:justify-between">
|
|
<label className="flex cursor-pointer select-none items-center gap-2 text-xs text-muted-foreground">
|
|
<Checkbox
|
|
checked={persistGlobal || !sessionId}
|
|
disabled={!sessionId}
|
|
onCheckedChange={checked => setPersistGlobal(checked === true)}
|
|
/>
|
|
{sessionId ? 'Persist globally (otherwise this session only)' : 'Persist globally'}
|
|
</label>
|
|
|
|
<Button onClick={() => onOpenChange(false)} variant="outline">
|
|
Cancel
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|
|
|
|
function ModelResults({
|
|
loading,
|
|
error,
|
|
providers,
|
|
currentModel,
|
|
currentProvider,
|
|
onSelectModel
|
|
}: {
|
|
loading: boolean
|
|
error: string | null
|
|
providers: ModelOptionProvider[]
|
|
currentModel: string
|
|
currentProvider: string
|
|
onSelectModel: (provider: ModelOptionProvider, model: string) => void
|
|
}) {
|
|
if (loading) {
|
|
return <LoadingResults />
|
|
}
|
|
|
|
if (error) {
|
|
return (
|
|
<div className="px-3 py-3">
|
|
<InlineNotice kind="error" title="Could not load models">
|
|
{error}
|
|
</InlineNotice>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
if (providers.length === 0) {
|
|
return <div className="px-4 py-6 text-sm text-muted-foreground">No authenticated providers.</div>
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{providers.map(provider => {
|
|
const models = provider.models ?? []
|
|
|
|
if (models.length === 0) {
|
|
return null
|
|
}
|
|
|
|
const unavailable = new Set(provider.unavailable_models ?? [])
|
|
|
|
return (
|
|
<CommandGroup heading={<ProviderHeading provider={provider} />} key={provider.slug}>
|
|
{provider.warning && (
|
|
<div className="px-2 pb-2">
|
|
<InlineNotice className="px-2.5 py-1.5 text-xs" kind="warning">
|
|
{provider.warning}
|
|
</InlineNotice>
|
|
</div>
|
|
)}
|
|
{models.map(model => {
|
|
const isCurrent = model === currentModel && provider.slug === currentProvider
|
|
const price = provider.pricing?.[model]
|
|
const locked = unavailable.has(model)
|
|
|
|
return (
|
|
<CommandItem
|
|
className={cn(
|
|
'flex items-center gap-2 pl-6 font-mono',
|
|
isCurrent &&
|
|
'bg-primary text-primary-foreground data-[selected=true]:bg-primary data-[selected=true]:text-primary-foreground',
|
|
locked && 'cursor-not-allowed opacity-45'
|
|
)}
|
|
disabled={locked}
|
|
key={`${provider.slug}:${model}`}
|
|
onSelect={() => {
|
|
if (!locked) {
|
|
onSelectModel(provider, model)
|
|
}
|
|
}}
|
|
value={`${provider.name} ${provider.slug} ${model}`}
|
|
>
|
|
<span className="min-w-0 flex-1 truncate">{model}</span>
|
|
{locked && <span className="shrink-0 text-[0.62rem] uppercase tracking-wide opacity-80">Pro</span>}
|
|
<ModelPrice isCurrent={isCurrent} price={price} />
|
|
</CommandItem>
|
|
)
|
|
})}
|
|
{unavailable.size > 0 && (
|
|
<div className="px-6 pb-2 pt-1 text-[0.62rem] leading-relaxed text-muted-foreground">
|
|
Pro models need a paid Nous subscription.
|
|
</div>
|
|
)}
|
|
</CommandGroup>
|
|
)
|
|
})}
|
|
</>
|
|
)
|
|
}
|
|
|
|
// Compact In/Out $/Mtok price tag, mirroring the CLI picker's price columns.
|
|
// Renders nothing when pricing is unavailable for the model.
|
|
function ModelPrice({ price, isCurrent }: { price?: ModelPricing; isCurrent: boolean }) {
|
|
if (!price || (!price.input && !price.output)) {
|
|
return null
|
|
}
|
|
|
|
if (price.free) {
|
|
return (
|
|
<span
|
|
className={cn(
|
|
'shrink-0 rounded-sm px-1 py-0.5 text-[0.62rem] font-semibold uppercase tracking-wide',
|
|
isCurrent ? 'bg-primary-foreground/20' : 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-400'
|
|
)}
|
|
>
|
|
Free
|
|
</span>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<span
|
|
className={cn(
|
|
'shrink-0 text-[0.66rem] tabular-nums',
|
|
isCurrent ? 'text-primary-foreground/80' : 'text-muted-foreground'
|
|
)}
|
|
title="Input / Output price per million tokens"
|
|
>
|
|
{price.input || '?'} / {price.output || '?'}
|
|
</span>
|
|
)
|
|
}
|
|
|
|
function LoadingResults() {
|
|
return (
|
|
<CommandGroup heading={<Skeleton className="h-3 w-32" />}>
|
|
{Array.from({ length: 4 }, (_, rowIndex) => (
|
|
<div className="rounded-sm py-1.5 pl-6 pr-2" key={rowIndex}>
|
|
<Skeleton className={cn('h-5', rowIndex % 3 === 0 ? 'w-3/5' : rowIndex % 3 === 1 ? 'w-4/5' : 'w-1/2')} />
|
|
</div>
|
|
))}
|
|
</CommandGroup>
|
|
)
|
|
}
|
|
|
|
function ProviderHeading({ provider }: { provider: ModelOptionProvider }) {
|
|
// free_tier is only set for Nous. true → "Free tier", false → "Pro".
|
|
const tierBadge =
|
|
provider.free_tier === true ? (
|
|
<span className="rounded-sm bg-emerald-500/15 px-1 py-0.5 text-[0.6rem] font-semibold uppercase tracking-wide text-emerald-600 dark:text-emerald-400">
|
|
Free tier
|
|
</span>
|
|
) : provider.free_tier === false ? (
|
|
<span className="rounded-sm bg-primary/15 px-1 py-0.5 text-[0.6rem] font-semibold uppercase tracking-wide text-primary">
|
|
Pro
|
|
</span>
|
|
) : null
|
|
|
|
return (
|
|
<span className="flex min-w-0 items-center gap-2">
|
|
<span className="truncate">{provider.name}</span>
|
|
<span className="font-mono text-xs font-normal normal-case tracking-normal text-muted-foreground">
|
|
{provider.slug} · {provider.total_models ?? provider.models?.length ?? 0}
|
|
</span>
|
|
{tierBadge}
|
|
</span>
|
|
)
|
|
}
|