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
130 lines
3.5 KiB
Go
130 lines
3.5 KiB
Go
package registry
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/jackc/pgx/v5/pgtype"
|
|
"gopkg.in/yaml.v3"
|
|
|
|
"github.com/memohai/memoh/internal/db/sqlc"
|
|
)
|
|
|
|
// Load reads all .yaml / .yml files from dir and returns parsed provider
|
|
// definitions. It returns nil (no error) when the directory does not exist.
|
|
// Malformed files are skipped with a warning logged via log.
|
|
func Load(log *slog.Logger, dir string) ([]ProviderDefinition, error) {
|
|
entries, err := os.ReadDir(dir)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil, nil
|
|
}
|
|
return nil, fmt.Errorf("read providers dir %s: %w", dir, err)
|
|
}
|
|
|
|
var defs []ProviderDefinition
|
|
for _, e := range entries {
|
|
if e.IsDir() {
|
|
continue
|
|
}
|
|
ext := strings.ToLower(filepath.Ext(e.Name()))
|
|
if ext != ".yaml" && ext != ".yml" {
|
|
continue
|
|
}
|
|
path := filepath.Join(dir, e.Name())
|
|
data, err := os.ReadFile(path) //nolint:gosec // operator-managed config directory
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read %s: %w", path, err)
|
|
}
|
|
var def ProviderDefinition
|
|
if err := yaml.Unmarshal(data, &def); err != nil {
|
|
log.Warn("registry: skipping malformed provider file",
|
|
slog.String("path", path), slog.Any("error", err))
|
|
continue
|
|
}
|
|
if def.Name == "" {
|
|
continue
|
|
}
|
|
defs = append(defs, def)
|
|
}
|
|
return defs, nil
|
|
}
|
|
|
|
// Sync upserts the given provider definitions into the database. New providers
|
|
// are created with enable=false and an empty API key. Existing providers get
|
|
// their icon and client_type refreshed. Models are upserted by (provider_id,
|
|
// model_id), overwriting name/type/config.
|
|
func Sync(ctx context.Context, logger *slog.Logger, queries *sqlc.Queries, defs []ProviderDefinition) error {
|
|
for _, def := range defs {
|
|
var icon pgtype.Text
|
|
if def.Icon != "" {
|
|
icon = pgtype.Text{String: def.Icon, Valid: true}
|
|
}
|
|
|
|
providerCfg := make(map[string]any)
|
|
for k, v := range def.Config {
|
|
providerCfg[k] = v
|
|
}
|
|
if def.BaseURL != "" {
|
|
providerCfg["base_url"] = def.BaseURL
|
|
}
|
|
providerConfigJSON, err := json.Marshal(providerCfg)
|
|
if err != nil {
|
|
logger.Warn("registry: failed to marshal provider config",
|
|
slog.String("name", def.Name), slog.Any("error", err))
|
|
continue
|
|
}
|
|
|
|
provider, err := queries.UpsertRegistryProvider(ctx, sqlc.UpsertRegistryProviderParams{
|
|
Name: def.Name,
|
|
ClientType: def.ClientType,
|
|
Icon: icon,
|
|
Config: providerConfigJSON,
|
|
})
|
|
if err != nil {
|
|
logger.Warn("registry: failed to upsert provider", slog.String("name", def.Name), slog.Any("error", err))
|
|
continue
|
|
}
|
|
|
|
for _, m := range def.Models {
|
|
configJSON, err := json.Marshal(m.Config)
|
|
if err != nil {
|
|
logger.Warn("registry: failed to marshal model config",
|
|
slog.String("provider", def.Name), slog.String("model", m.ModelID), slog.Any("error", err))
|
|
continue
|
|
}
|
|
|
|
var name pgtype.Text
|
|
if m.Name != "" {
|
|
name = pgtype.Text{String: m.Name, Valid: true}
|
|
}
|
|
|
|
typ := m.Type
|
|
if typ == "" {
|
|
typ = "chat"
|
|
}
|
|
|
|
_, err = queries.UpsertRegistryModel(ctx, sqlc.UpsertRegistryModelParams{
|
|
ModelID: m.ModelID,
|
|
Name: name,
|
|
ProviderID: provider.ID,
|
|
Type: typ,
|
|
Config: configJSON,
|
|
})
|
|
if err != nil {
|
|
logger.Warn("registry: failed to upsert model",
|
|
slog.String("provider", def.Name), slog.String("model", m.ModelID), slog.Any("error", err))
|
|
continue
|
|
}
|
|
}
|
|
|
|
logger.Info("registry: synced provider", slog.String("name", def.Name), slog.Int("models", len(def.Models)))
|
|
}
|
|
return nil
|
|
}
|