apunkt/rowboat
1
0
Fork 0
mirror of https://github.com/rowboatlabs/rowboat.git synced 2026-05-28 19:05:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add models

Browse source
This commit is contained in:
Arjun 2026-02-27 23:43:59 +05:30
parent d26b14e873
commit 75b384eac1
4 changed files with 140 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
View file

@ -126,20 +126,23 @@ function ChatInputInner({
const [configuredModels, setConfiguredModels] = useState<ConfiguredModel[]>([]) const [configuredModels, setConfiguredModels] = useState<ConfiguredModel[]>([])
const [activeModelKey, setActiveModelKey] = useState('') const [activeModelKey, setActiveModelKey] = useState('')
// Load model config from disk // Load model config from disk (on mount and whenever tab becomes active)
useEffect(() => { const loadModelConfig = useCallback(async () => {
async function loadModels() { try {
try { const result = await window.ipc.invoke('workspace:readFile', { path: 'config/models.json' })
const result = await window.ipc.invoke('workspace:readFile', { path: 'config/models.json' }) const parsed = JSON.parse(result.data)
const parsed = JSON.parse(result.data) const models: ConfiguredModel[] = []
const models: ConfiguredModel[] = [] if (parsed?.providers) {
if (parsed?.providers) { for (const [flavor, entry] of Object.entries(parsed.providers)) {
for (const [flavor, entry] of Object.entries(parsed.providers)) { const e = entry as Record<string, unknown>
const e = entry as Record<string, unknown> const modelList: string[] = Array.isArray(e.models) ? e.models as string[] : []
if (e.model && typeof e.model === 'string') { const singleModel = typeof e.model === 'string' ? e.model : ''
const allModels = modelList.length > 0 ? modelList : singleModel ? [singleModel] : []
for (const model of allModels) {
if (model) {
models.push({ models.push({
flavor, flavor,
model: e.model, model,
apiKey: (e.apiKey as string) || undefined, apiKey: (e.apiKey as string) || undefined,
baseURL: (e.baseURL as string) || undefined, baseURL: (e.baseURL as string) || undefined,
headers: (e.headers as Record<string, string>) || undefined, headers: (e.headers as Record<string, string>) || undefined,
@ -148,17 +151,20 @@ function ChatInputInner({
} }
} }
} }
setConfiguredModels(models)
if (parsed?.provider?.flavor && parsed?.model) {
setActiveModelKey(`${parsed.provider.flavor}/${parsed.model}`)
}
} catch {
// No config yet
} }
setConfiguredModels(models)
if (parsed?.provider?.flavor && parsed?.model) {
setActiveModelKey(`${parsed.provider.flavor}/${parsed.model}`)
}
} catch {
// No config yet
} }
loadModels()
}, []) }, [])
useEffect(() => {
loadModelConfig()
}, [isActive, loadModelConfig])
const handleModelChange = useCallback(async (key: string) => { const handleModelChange = useCallback(async (key: string) => {
const entry = configuredModels.find((m) => `${m.flavor}/${m.model}` === key) const entry = configuredModels.find((m) => `${m.flavor}/${m.model}` === key)
if (!entry) return if (!entry) return

155
apps/x/apps/renderer/src/components/settings-dialog.tsx
View file

@ -2,7 +2,7 @@
import * as React from "react" import * as React from "react"
import { useState, useEffect, useCallback } from "react" import { useState, useEffect, useCallback } from "react"
import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2 } from "lucide-react" import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2, Plus, X } from "lucide-react"
import { import {
Dialog, Dialog,
@ -167,14 +167,14 @@ const defaultBaseURLs: Partial<Record<LlmProviderFlavor, string>> = {
function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) { function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
const [provider, setProvider] = useState<LlmProviderFlavor>("openai") const [provider, setProvider] = useState<LlmProviderFlavor>("openai")
const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>>({ const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; models: string[]; knowledgeGraphModel: string }>>({
openai: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" }, openai: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "" },
anthropic: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" }, anthropic: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "" },
google: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" }, google: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "" },
openrouter: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" }, openrouter: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "" },
aigateway: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" }, aigateway: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "" },
ollama: { apiKey: "", baseURL: "http://localhost:11434", model: "", knowledgeGraphModel: "" }, ollama: { apiKey: "", baseURL: "http://localhost:11434", models: [""], knowledgeGraphModel: "" },
"openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", model: "", knowledgeGraphModel: "" }, "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", models: [""], knowledgeGraphModel: "" },
}) })
const [modelsCatalog, setModelsCatalog] = useState<Record<string, LlmModelOption[]>>({}) const [modelsCatalog, setModelsCatalog] = useState<Record<string, LlmModelOption[]>>({})
const [modelsLoading, setModelsLoading] = useState(false) const [modelsLoading, setModelsLoading] = useState(false)
@ -193,13 +193,14 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
const showModelInput = isLocalProvider || modelsForProvider.length === 0 const showModelInput = isLocalProvider || modelsForProvider.length === 0
const isMoreProvider = moreProviders.some(p => p.id === provider) const isMoreProvider = moreProviders.some(p => p.id === provider)
const primaryModel = activeConfig.models[0] || ""
const canTest = const canTest =
activeConfig.model.trim().length > 0 && primaryModel.trim().length > 0 &&
(!requiresApiKey || activeConfig.apiKey.trim().length > 0) && (!requiresApiKey || activeConfig.apiKey.trim().length > 0) &&
(!requiresBaseURL || activeConfig.baseURL.trim().length > 0) (!requiresBaseURL || activeConfig.baseURL.trim().length > 0)
const updateConfig = useCallback( const updateConfig = useCallback(
(prov: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>) => { (prov: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; models: string[]; knowledgeGraphModel: string }>) => {
setProviderConfigs(prev => ({ setProviderConfigs(prev => ({
...prev, ...prev,
[prov]: { ...prev[prov], ...updates }, [prov]: { ...prev[prov], ...updates },
@ -209,6 +210,39 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
[] []
) )
const updateModelAt = useCallback(
(prov: LlmProviderFlavor, index: number, value: string) => {
setProviderConfigs(prev => {
const models = [...prev[prov].models]
models[index] = value
return { ...prev, [prov]: { ...prev[prov], models } }
})
setTestState({ status: "idle" })
},
[]
)
const addModel = useCallback(
(prov: LlmProviderFlavor) => {
setProviderConfigs(prev => ({
...prev,
[prov]: { ...prev[prov], models: [...prev[prov].models, ""] },
}))
},
[]
)
const removeModel = useCallback(
(prov: LlmProviderFlavor, index: number) => {
setProviderConfigs(prev => {
const models = prev[prov].models.filter((_, i) => i !== index)
return { ...prev, [prov]: { ...prev[prov], models: models.length > 0 ? models : [""] } }
})
setTestState({ status: "idle" })
},
[]
)
// Load current config from file // Load current config from file
useEffect(() => { useEffect(() => {
if (!dialogOpen) return if (!dialogOpen) return
@ -230,20 +264,27 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
for (const [key, entry] of Object.entries(parsed.providers)) { for (const [key, entry] of Object.entries(parsed.providers)) {
if (key in next) { if (key in next) {
const e = entry as any; const e = entry as any;
const savedModels: string[] = Array.isArray(e.models) && e.models.length > 0
? e.models
: e.model ? [e.model] : [""];
next[key as LlmProviderFlavor] = { next[key as LlmProviderFlavor] = {
apiKey: e.apiKey || "", apiKey: e.apiKey || "",
baseURL: e.baseURL || (defaultBaseURLs[key as LlmProviderFlavor] || ""), baseURL: e.baseURL || (defaultBaseURLs[key as LlmProviderFlavor] || ""),
model: e.model || "", models: savedModels,
knowledgeGraphModel: e.knowledgeGraphModel || "", knowledgeGraphModel: e.knowledgeGraphModel || "",
}; };
} }
} }
} }
// Active provider takes precedence from top-level config // Active provider takes precedence from top-level config
const existingModels = next[flavor].models;
const activeModels = existingModels[0] === parsed.model
? existingModels
: [parsed.model, ...existingModels.filter((m: string) => m && m !== parsed.model)];
next[flavor] = { next[flavor] = {
apiKey: parsed.provider.apiKey || "", apiKey: parsed.provider.apiKey || "",
baseURL: parsed.provider.baseURL || (defaultBaseURLs[flavor] || ""), baseURL: parsed.provider.baseURL || (defaultBaseURLs[flavor] || ""),
model: parsed.model, models: activeModels.length > 0 ? activeModels : [""],
knowledgeGraphModel: parsed.knowledgeGraphModel || "", knowledgeGraphModel: parsed.knowledgeGraphModel || "",
}; };
return next; return next;
@ -291,11 +332,12 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
const next = { ...prev } const next = { ...prev }
const cloudProviders: LlmProviderFlavor[] = ["openai", "anthropic", "google"] const cloudProviders: LlmProviderFlavor[] = ["openai", "anthropic", "google"]
for (const prov of cloudProviders) { for (const prov of cloudProviders) {
const models = modelsCatalog[prov] const catalog = modelsCatalog[prov]
if (models?.length && !next[prov].model) { if (catalog?.length && !next[prov].models[0]) {
const preferred = preferredDefaults[prov] const preferred = preferredDefaults[prov]
const hasPreferred = preferred && models.some(m => m.id === preferred) const hasPreferred = preferred && catalog.some(m => m.id === preferred)
next[prov] = { ...next[prov], model: hasPreferred ? preferred : (models[0]?.id || "") } const defaultModel = hasPreferred ? preferred! : (catalog[0]?.id || "")
next[prov] = { ...next[prov], models: [defaultModel] }
} }
} }
return next return next
@ -306,13 +348,15 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
if (!canTest) return if (!canTest) return
setTestState({ status: "testing" }) setTestState({ status: "testing" })
try { try {
const allModels = activeConfig.models.map(m => m.trim()).filter(Boolean)
const providerConfig = { const providerConfig = {
provider: { provider: {
flavor: provider, flavor: provider,
apiKey: activeConfig.apiKey.trim() || undefined, apiKey: activeConfig.apiKey.trim() || undefined,
baseURL: activeConfig.baseURL.trim() || undefined, baseURL: activeConfig.baseURL.trim() || undefined,
}, },
model: activeConfig.model.trim(), model: allModels[0] || "",
models: allModels,
knowledgeGraphModel: activeConfig.knowledgeGraphModel.trim() || undefined, knowledgeGraphModel: activeConfig.knowledgeGraphModel.trim() || undefined,
} }
const result = await window.ipc.invoke("models:test", providerConfig) const result = await window.ipc.invoke("models:test", providerConfig)
@ -382,6 +426,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
{/* Model selection - side by side */} {/* Model selection - side by side */}
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-2 gap-3">
{/* Assistant models (left column) */}
<div className="space-y-2"> <div className="space-y-2">
<span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Assistant model</span> <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Assistant model</span>
{modelsLoading ? ( {modelsLoading ? (
@ -389,34 +434,58 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
<Loader2 className="size-4 animate-spin" /> <Loader2 className="size-4 animate-spin" />
Loading... Loading...
</div> </div>
) : showModelInput ? (
<Input
value={activeConfig.model}
onChange={(e) => updateConfig(provider, { model: e.target.value })}
placeholder="Enter model"
/>
) : ( ) : (
<Select <div className="space-y-2">
value={activeConfig.model} {activeConfig.models.map((model, index) => (
onValueChange={(value) => updateConfig(provider, { model: value })} <div key={index} className="group/model relative">
> {showModelInput ? (
<SelectTrigger> <Input
<SelectValue placeholder="Select a model" /> value={model}
</SelectTrigger> onChange={(e) => updateModelAt(provider, index, e.target.value)}
<SelectContent> placeholder="Enter model"
{modelsForProvider.map((model) => ( />
<SelectItem key={model.id} value={model.id}> ) : (
{model.name || model.id} <Select
</SelectItem> value={model}
))} onValueChange={(value) => updateModelAt(provider, index, value)}
</SelectContent> >
</Select> <SelectTrigger>
<SelectValue placeholder="Select a model" />
</SelectTrigger>
<SelectContent>
{modelsForProvider.map((m) => (
<SelectItem key={m.id} value={m.id}>
{m.name || m.id}
</SelectItem>
))}
</SelectContent>
</Select>
)}
{activeConfig.models.length > 1 && (
<button
onClick={() => removeModel(provider, index)}
className="absolute right-8 top-1/2 -translate-y-1/2 flex size-6 items-center justify-center rounded text-muted-foreground opacity-0 transition-opacity hover:text-foreground group-hover/model:opacity-100"
>
<X className="size-3.5" />
</button>
)}
</div>
))}
<button
onClick={() => addModel(provider)}
className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
>
<Plus className="size-3.5" />
Add assistant model
</button>
</div>
)} )}
{modelsError && ( {modelsError && (
<div className="text-xs text-destructive">{modelsError}</div> <div className="text-xs text-destructive">{modelsError}</div>
)} )}
</div> </div>
{/* Knowledge graph model (right column) */}
<div className="space-y-2"> <div className="space-y-2">
<span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Knowledge graph model</span> <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Knowledge graph model</span>
{modelsLoading ? ( {modelsLoading ? (
@ -428,7 +497,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
<Input <Input
value={activeConfig.knowledgeGraphModel} value={activeConfig.knowledgeGraphModel}
onChange={(e) => updateConfig(provider, { knowledgeGraphModel: e.target.value })} onChange={(e) => updateConfig(provider, { knowledgeGraphModel: e.target.value })}
placeholder={activeConfig.model || "Enter model"} placeholder={primaryModel || "Enter model"}
/> />
) : ( ) : (
<Select <Select
@ -440,9 +509,9 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="__same__">Same as assistant</SelectItem> <SelectItem value="__same__">Same as assistant</SelectItem>
{modelsForProvider.map((model) => ( {modelsForProvider.map((m) => (
<SelectItem key={model.id} value={model.id}> <SelectItem key={m.id} value={m.id}>
{model.name || model.id} {m.name || m.id}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>

2
apps/x/packages/core/src/models/repo.ts
View file

@ -44,10 +44,12 @@ export class FSModelConfigRepo implements IModelConfigRepo {
} }
existingProviders[config.provider.flavor] = { existingProviders[config.provider.flavor] = {
...existingProviders[config.provider.flavor],
apiKey: config.provider.apiKey, apiKey: config.provider.apiKey,
baseURL: config.provider.baseURL, baseURL: config.provider.baseURL,
headers: config.provider.headers, headers: config.provider.headers,
model: config.model, model: config.model,
models: config.models,
knowledgeGraphModel: config.knowledgeGraphModel, knowledgeGraphModel: config.knowledgeGraphModel,
}; };

1
apps/x/packages/shared/src/models.ts
View file

@ -10,5 +10,6 @@ export const LlmProvider = z.object({
export const LlmModelConfig = z.object({ export const LlmModelConfig = z.object({
provider: LlmProvider, provider: LlmProvider,
model: z.string(), model: z.string(),
models: z.array(z.string()).optional(),
knowledgeGraphModel: z.string().optional(), knowledgeGraphModel: z.string().optional(),
}); });