mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
8d5c38f0e5
* refactor: unify providers and models tables
- Rename `llm_providers` → `providers`, `llm_provider_oauth_tokens` → `provider_oauth_tokens`
- Remove `tts_providers` and `tts_models` tables; speech models now live in the unified `models` table with `type = 'speech'`
- Replace top-level `api_key`/`base_url` columns with a JSONB `config` field on `providers`
- Rename `llm_provider_id` → `provider_id` across all references
- Add `edge-speech` client type and `conf/providers/edge.yaml` default provider
- Create new read-only speech endpoints (`/speech-providers`, `/speech-models`) backed by filtered views of the unified tables
- Remove old TTS CRUD handlers; simplify speech page to read-only + test
- Update registry loader to skip malformed YAML files instead of failing entirely
- Fix YAML quoting for model names containing colons in openrouter.yaml
- Regenerate sqlc, swagger, and TypeScript SDK
* fix: exclude speech providers from providers list endpoint
ListProviders now filters out client_type matching '%-speech' so Edge
and future speech providers no longer appear on the Providers page.
ListSpeechProviders uses the same pattern match instead of hard-coding
'edge-speech'.
* fix: use explicit client_type list instead of LIKE pattern
Replace '%-speech' pattern with explicit IN ('edge-speech') for both
ListProviders (exclusion) and ListSpeechProviders (inclusion). New
speech client types must be added to both queries.
* fix: use EXECUTE for dynamic SQL in migrations referencing old schema
PL/pgSQL pre-validates column/table references in static SQL statements
inside DO blocks before evaluating IF/RETURN guards. This caused
migrations 0010-0061 to fail on fresh databases where the canonical
schema uses `providers`/`provider_id` instead of `llm_providers`/
`llm_provider_id`.
Wrap all SQL that references potentially non-existent old schema objects
(llm_providers, llm_provider_id, tts_providers, tts_models, etc.) in
EXECUTE strings so they are only parsed at runtime when actually reached.
* fix: revert canonical schema to use llm_providers for migration compatibility
The CI migrations workflow (up → down → up) failed because 0061 down
renames `providers` back to `llm_providers`, but 0001 down only dropped
`providers` — leaving `llm_providers` as a remnant. On the second
migrate up, 0010 found the stale `llm_providers` and tried to reference
`models.llm_provider_id` which no longer existed.
Revert 0001 canonical schema to use original names (llm_providers,
tts_providers, tts_models) so incremental migrations work naturally and
0061 handles the final rename. Remove EXECUTE wrappers and unnecessary
guards from migrations that now always operate on llm_providers.
* fix: icons
* fix: sync canonical schema with 0061 migration to fix sqlc column mismatch
0001_init.up.sql still used old names (llm_providers, llm_provider_id)
and included dropped tts_providers/tts_models tables. sqlc could not
parse the PL/pgSQL EXECUTE in migration 0061, so generated code retained
stale columns (input_modalities, supports_reasoning) causing runtime
"column does not exist" errors when adding models.
- Update 0001_init.up.sql to current schema (providers, provider_id,
no tts tables, add provider_oauth_tokens)
- Use ALTER TABLE IF EXISTS in 0010/0041/0042 for backward compat
- Regenerate sqlc
* fix: guard all legacy migrations against fresh schema for CI compat
On fresh databases, 0001_init.up.sql creates providers/provider_id
(not llm_providers/llm_provider_id). Migrations 0013, 0041, 0046, 0047
referenced the old names without guards, causing CI migration failures.
- 0013: check llm_provider_id column exists before adding old constraint
- 0041: check llm_providers table exists before backfill/constraint DDL
- 0046: wrap CREATE TABLE in DO block with llm_providers existence check
- 0047: use ALTER TABLE IF EXISTS + DO block guard
108 lines
3.2 KiB
Go
108 lines
3.2 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/memohai/memoh/internal/models"
|
|
"github.com/memohai/memoh/internal/settings"
|
|
)
|
|
|
|
func (h *Handler) buildModelGroup() *CommandGroup {
|
|
g := newCommandGroup("model", "Manage bot models")
|
|
g.Register(SubCommand{
|
|
Name: "list",
|
|
Usage: "list - List all available chat models",
|
|
Handler: func(cc CommandContext) (string, error) {
|
|
items, err := h.modelsService.ListByType(cc.Ctx, models.ModelTypeChat)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if len(items) == 0 {
|
|
return "No chat models found.", nil
|
|
}
|
|
records := make([][]kv, 0, len(items))
|
|
for _, item := range items {
|
|
provName := h.resolveProviderName(cc, item.ProviderID)
|
|
records = append(records, []kv{
|
|
{"Model", item.Name},
|
|
{"Provider", provName},
|
|
{"Model ID", item.ModelID},
|
|
})
|
|
}
|
|
return formatItems(records), nil
|
|
},
|
|
})
|
|
g.Register(SubCommand{
|
|
Name: "set",
|
|
Usage: "set <provider_name> <model_name> - Set the chat model",
|
|
IsWrite: true,
|
|
Handler: func(cc CommandContext) (string, error) {
|
|
if len(cc.Args) < 2 {
|
|
return "Usage: /model set <provider_name> <model_name>", nil
|
|
}
|
|
modelResp, err := h.findModelByProviderAndName(cc, cc.Args[0], cc.Args[1])
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
_, err = h.settingsService.UpsertBot(cc.Ctx, cc.BotID, settings.UpsertRequest{
|
|
ChatModelID: modelResp.ID,
|
|
})
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return fmt.Sprintf("Chat model set to %s (%s).", modelResp.Name, cc.Args[0]), nil
|
|
},
|
|
})
|
|
g.Register(SubCommand{
|
|
Name: "set-heartbeat",
|
|
Usage: "set-heartbeat <provider_name> <model_name> - Set the heartbeat model",
|
|
IsWrite: true,
|
|
Handler: func(cc CommandContext) (string, error) {
|
|
if len(cc.Args) < 2 {
|
|
return "Usage: /model set-heartbeat <provider_name> <model_name>", nil
|
|
}
|
|
modelResp, err := h.findModelByProviderAndName(cc, cc.Args[0], cc.Args[1])
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
_, err = h.settingsService.UpsertBot(cc.Ctx, cc.BotID, settings.UpsertRequest{
|
|
HeartbeatModelID: modelResp.ID,
|
|
})
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return fmt.Sprintf("Heartbeat model set to %s (%s).", modelResp.Name, cc.Args[0]), nil
|
|
},
|
|
})
|
|
return g
|
|
}
|
|
|
|
func (h *Handler) resolveProviderName(cc CommandContext, providerID string) string {
|
|
if h.providersService == nil || providerID == "" {
|
|
return providerID
|
|
}
|
|
p, err := h.providersService.Get(cc.Ctx, providerID)
|
|
if err != nil {
|
|
return providerID
|
|
}
|
|
return p.Name
|
|
}
|
|
|
|
func (h *Handler) findModelByProviderAndName(cc CommandContext, providerName, modelName string) (models.GetResponse, error) {
|
|
provider, err := h.providersService.GetByName(cc.Ctx, providerName)
|
|
if err != nil {
|
|
return models.GetResponse{}, fmt.Errorf("provider %q not found", providerName)
|
|
}
|
|
chatModels, err := h.modelsService.ListByProviderIDAndType(cc.Ctx, provider.ID, models.ModelTypeChat)
|
|
if err != nil {
|
|
return models.GetResponse{}, err
|
|
}
|
|
for _, m := range chatModels {
|
|
if strings.EqualFold(m.Name, modelName) || strings.EqualFold(m.ModelID, modelName) {
|
|
return m, nil
|
|
}
|
|
}
|
|
return models.GetResponse{}, fmt.Errorf("model %q not found under provider %q", modelName, providerName)
|
|
}
|