Skip to content

fix(settings): Providers screen fetches models through /api/models, not the gateway (follow-up to #17) #28

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

Closed
lightcloud00 wants to merge 1 commit into from
Closed

fix(settings): Providers screen fetches models through /api/models, not the gateway (follow-up to #17) #28

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
97 changes: 10 additions & 87 deletions src/screens/settings/providers-screen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,102 +115,25 @@ type SaveSettingPayload = {
label: string
}

const HERMES_API_URL = process.env.HERMES_API_URL || 'http://127.0.0.1:8642'

type HermesCatalogEntry =
| string
| {
id: string
provider: string
name: string
[key: string]: unknown
}

function isHermesCatalogEntry(
entry: HermesCatalogEntry | null,
): entry is HermesCatalogEntry {
return entry !== null
}

async function fetchModels(): Promise<{
ok?: boolean
models?: Array<ModelCatalogEntry>
configuredProviders?: Array<string>
}> {
const response = await fetch(`${HERMES_API_URL}/v1/models`)
// Go through Studio's own /api/models route, which holds the gateway bearer
// server-side and performs the same id/name/provider normalization this
// function used to do by hand. The browser has no gateway credential, and in
// a container or remote deploy 127.0.0.1:8642 is the viewer's machine rather
// than the gateway. Every other model consumer already uses this route.
const response = await fetch('/api/models')
if (!response.ok) {
throw new Error(`Hermes models request failed (${response.status})`)
}

const payload = (await response.json()) as
| Array<unknown>
| {
data?: Array<Record<string, unknown>>
models?: Array<Record<string, unknown>>
}
const rawModels = Array.isArray(payload)
? payload
: Array.isArray(payload.data)
? payload.data
: Array.isArray(payload.models)
? payload.models
: []

const models = rawModels
.map((entry) => {
if (typeof entry === 'string') return entry
if (!entry || typeof entry !== 'object') return null
const record = entry as Record<string, unknown>
const id =
typeof record.id === 'string'
? record.id.trim()
: typeof record.name === 'string'
? record.name.trim()
: typeof record.model === 'string'
? record.model.trim()
: ''
if (!id) return null
const provider =
typeof record.provider === 'string' && record.provider.trim()
? record.provider.trim()
: typeof record.owned_by === 'string' && record.owned_by.trim()
? record.owned_by.trim()
: id.includes('/')
? id.split('/')[0]
: 'hermes-agent'

return {
...record,
id,
provider,
name:
typeof record.name === 'string' && record.name.trim()
? record.name.trim()
: typeof record.display_name === 'string' &&
record.display_name.trim()
? record.display_name.trim()
: typeof record.label === 'string' && record.label.trim()
? record.label.trim()
: id,
}
})
.filter(isHermesCatalogEntry)

const configuredProviders = Array.from(
new Set(
models.flatMap((entry) => {
if (typeof entry === 'string') return []
return typeof entry.provider === 'string' && entry.provider
? [entry.provider]
: []
}),
),
)

return {
ok: true,
models: models as Array<ModelCatalogEntry>,
configuredProviders,
return (await response.json()) as {
ok?: boolean
models?: Array<ModelCatalogEntry>
configuredProviders?: Array<string>
}
}

Expand Down