mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
Acbox Liu
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
212 lines
5.2 KiB
SQL
212 lines
5.2 KiB
SQL
-- name: CreateProvider :one
|
|
INSERT INTO providers (name, client_type, icon, enable, config, metadata)
|
|
VALUES (
|
|
sqlc.arg(name),
|
|
sqlc.arg(client_type),
|
|
sqlc.arg(icon),
|
|
sqlc.arg(enable),
|
|
sqlc.arg(config),
|
|
sqlc.arg(metadata)
|
|
)
|
|
RETURNING *;
|
|
|
|
-- name: GetProviderByID :one
|
|
SELECT * FROM providers WHERE id = sqlc.arg(id);
|
|
|
|
-- name: GetProviderByName :one
|
|
SELECT * FROM providers WHERE name = sqlc.arg(name);
|
|
|
|
-- name: ListProviders :many
|
|
SELECT * FROM providers
|
|
WHERE client_type NOT IN ('edge-speech')
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: UpdateProvider :one
|
|
UPDATE providers
|
|
SET
|
|
name = sqlc.arg(name),
|
|
client_type = sqlc.arg(client_type),
|
|
icon = sqlc.arg(icon),
|
|
enable = sqlc.arg(enable),
|
|
config = sqlc.arg(config),
|
|
metadata = sqlc.arg(metadata),
|
|
updated_at = now()
|
|
WHERE id = sqlc.arg(id)
|
|
RETURNING *;
|
|
|
|
-- name: DeleteProvider :exec
|
|
DELETE FROM providers WHERE id = sqlc.arg(id);
|
|
|
|
-- name: CountProviders :one
|
|
SELECT COUNT(*) FROM providers;
|
|
|
|
-- name: CreateModel :one
|
|
INSERT INTO models (model_id, name, provider_id, type, config)
|
|
VALUES (
|
|
sqlc.arg(model_id),
|
|
sqlc.arg(name),
|
|
sqlc.arg(provider_id),
|
|
sqlc.arg(type),
|
|
sqlc.arg(config)
|
|
)
|
|
RETURNING *;
|
|
|
|
-- name: GetModelByID :one
|
|
SELECT * FROM models WHERE id = sqlc.arg(id);
|
|
|
|
-- name: GetModelByModelID :one
|
|
SELECT * FROM models WHERE model_id = sqlc.arg(model_id);
|
|
|
|
-- name: ListModelsByModelID :many
|
|
SELECT * FROM models
|
|
WHERE model_id = sqlc.arg(model_id)
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListModels :many
|
|
SELECT * FROM models
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListModelsByType :many
|
|
SELECT * FROM models
|
|
WHERE type = sqlc.arg(type)
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListModelsByProviderID :many
|
|
SELECT * FROM models
|
|
WHERE provider_id = sqlc.arg(provider_id)
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListModelsByProviderIDAndType :many
|
|
SELECT * FROM models
|
|
WHERE provider_id = sqlc.arg(provider_id)
|
|
AND type = sqlc.arg(type)
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListModelsByProviderClientType :many
|
|
SELECT m.*
|
|
FROM models m
|
|
JOIN providers p ON m.provider_id = p.id
|
|
WHERE p.client_type = sqlc.arg(client_type)
|
|
ORDER BY m.created_at DESC;
|
|
|
|
-- name: UpdateModel :one
|
|
UPDATE models
|
|
SET
|
|
model_id = sqlc.arg(model_id),
|
|
name = sqlc.arg(name),
|
|
provider_id = sqlc.arg(provider_id),
|
|
type = sqlc.arg(type),
|
|
config = sqlc.arg(config),
|
|
updated_at = now()
|
|
WHERE id = sqlc.arg(id)
|
|
RETURNING *;
|
|
|
|
-- name: DeleteModel :exec
|
|
DELETE FROM models WHERE id = sqlc.arg(id);
|
|
|
|
-- name: DeleteModelByModelID :exec
|
|
DELETE FROM models WHERE model_id = sqlc.arg(model_id);
|
|
|
|
-- name: CountModels :one
|
|
SELECT COUNT(*) FROM models;
|
|
|
|
-- name: CountModelsByType :one
|
|
SELECT COUNT(*) FROM models WHERE type = sqlc.arg(type);
|
|
|
|
|
|
-- name: UpsertRegistryProvider :one
|
|
INSERT INTO providers (name, client_type, icon, enable, config, metadata)
|
|
VALUES (sqlc.arg(name), sqlc.arg(client_type), sqlc.arg(icon), false, sqlc.arg(config), '{}')
|
|
ON CONFLICT (name) DO UPDATE SET
|
|
icon = EXCLUDED.icon,
|
|
client_type = EXCLUDED.client_type,
|
|
config = CASE
|
|
WHEN providers.config->>'api_key' IS NOT NULL AND providers.config->>'api_key' != ''
|
|
THEN jsonb_set(EXCLUDED.config, '{api_key}', providers.config->'api_key')
|
|
ELSE EXCLUDED.config
|
|
END,
|
|
updated_at = now()
|
|
RETURNING *;
|
|
|
|
-- name: UpsertRegistryModel :one
|
|
INSERT INTO models (model_id, name, provider_id, type, config)
|
|
VALUES (sqlc.arg(model_id), sqlc.arg(name), sqlc.arg(provider_id), sqlc.arg(type), sqlc.arg(config))
|
|
ON CONFLICT (provider_id, model_id) DO UPDATE SET
|
|
name = EXCLUDED.name,
|
|
type = EXCLUDED.type,
|
|
config = EXCLUDED.config,
|
|
updated_at = now()
|
|
RETURNING *;
|
|
|
|
-- name: ListEnabledModels :many
|
|
SELECT m.*
|
|
FROM models m
|
|
JOIN providers p ON m.provider_id = p.id
|
|
WHERE p.enable = true
|
|
ORDER BY m.created_at DESC;
|
|
|
|
-- name: ListEnabledModelsByType :many
|
|
SELECT m.*
|
|
FROM models m
|
|
JOIN providers p ON m.provider_id = p.id
|
|
WHERE p.enable = true
|
|
AND m.type = sqlc.arg(type)
|
|
ORDER BY m.created_at DESC;
|
|
|
|
-- name: ListEnabledModelsByProviderClientType :many
|
|
SELECT m.*
|
|
FROM models m
|
|
JOIN providers p ON m.provider_id = p.id
|
|
WHERE p.enable = true
|
|
AND p.client_type = sqlc.arg(client_type)
|
|
ORDER BY m.created_at DESC;
|
|
|
|
-- name: CreateModelVariant :one
|
|
INSERT INTO model_variants (model_uuid, variant_id, weight, metadata)
|
|
VALUES (
|
|
sqlc.arg(model_uuid),
|
|
sqlc.arg(variant_id),
|
|
sqlc.arg(weight),
|
|
sqlc.arg(metadata)
|
|
)
|
|
RETURNING *;
|
|
|
|
-- name: ListModelVariantsByModelUUID :many
|
|
SELECT * FROM model_variants
|
|
WHERE model_uuid = sqlc.arg(model_uuid)
|
|
ORDER BY weight DESC, created_at DESC;
|
|
|
|
-- name: GetSpeechModelWithProvider :one
|
|
SELECT
|
|
m.*,
|
|
p.client_type AS provider_type
|
|
FROM models m
|
|
JOIN providers p ON p.id = m.provider_id
|
|
WHERE m.id = sqlc.arg(id)
|
|
AND m.type = 'speech';
|
|
|
|
-- name: ListSpeechProviders :many
|
|
SELECT * FROM providers
|
|
WHERE client_type IN ('edge-speech')
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: ListSpeechModels :many
|
|
SELECT m.*,
|
|
p.client_type AS provider_type
|
|
FROM models m
|
|
JOIN providers p ON p.id = m.provider_id
|
|
WHERE m.type = 'speech'
|
|
ORDER BY m.created_at DESC;
|
|
|
|
-- name: ListSpeechModelsByProviderID :many
|
|
SELECT * FROM models
|
|
WHERE provider_id = sqlc.arg(provider_id)
|
|
AND type = 'speech'
|
|
ORDER BY created_at DESC;
|
|
|
|
-- name: GetModelByProviderAndModelID :one
|
|
SELECT * FROM models
|
|
WHERE provider_id = sqlc.arg(provider_id)
|
|
AND model_id = sqlc.arg(model_id)
|
|
LIMIT 1;
|