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
112 lines
5.1 KiB
SQL
112 lines
5.1 KiB
SQL
-- name: GetSettingsByBotID :one
|
|
SELECT
|
|
bots.id AS bot_id,
|
|
bots.language,
|
|
bots.reasoning_enabled,
|
|
bots.reasoning_effort,
|
|
bots.heartbeat_enabled,
|
|
bots.heartbeat_interval,
|
|
bots.heartbeat_prompt,
|
|
bots.compaction_enabled,
|
|
bots.compaction_threshold,
|
|
bots.compaction_ratio,
|
|
chat_models.id AS chat_model_id,
|
|
heartbeat_models.id AS heartbeat_model_id,
|
|
compaction_models.id AS compaction_model_id,
|
|
title_models.id AS title_model_id,
|
|
search_providers.id AS search_provider_id,
|
|
memory_providers.id AS memory_provider_id,
|
|
image_models.id AS image_model_id,
|
|
tts_models.id AS tts_model_id,
|
|
browser_contexts.id AS browser_context_id
|
|
FROM bots
|
|
LEFT JOIN models AS chat_models ON chat_models.id = bots.chat_model_id
|
|
LEFT JOIN models AS heartbeat_models ON heartbeat_models.id = bots.heartbeat_model_id
|
|
LEFT JOIN models AS compaction_models ON compaction_models.id = bots.compaction_model_id
|
|
LEFT JOIN models AS title_models ON title_models.id = bots.title_model_id
|
|
LEFT JOIN models AS image_models ON image_models.id = bots.image_model_id
|
|
LEFT JOIN search_providers ON search_providers.id = bots.search_provider_id
|
|
LEFT JOIN memory_providers ON memory_providers.id = bots.memory_provider_id
|
|
LEFT JOIN models AS tts_models ON tts_models.id = bots.tts_model_id
|
|
LEFT JOIN browser_contexts ON browser_contexts.id = bots.browser_context_id
|
|
WHERE bots.id = $1;
|
|
|
|
-- name: UpsertBotSettings :one
|
|
WITH updated AS (
|
|
UPDATE bots
|
|
SET language = sqlc.arg(language),
|
|
reasoning_enabled = sqlc.arg(reasoning_enabled),
|
|
reasoning_effort = sqlc.arg(reasoning_effort),
|
|
heartbeat_enabled = sqlc.arg(heartbeat_enabled),
|
|
heartbeat_interval = sqlc.arg(heartbeat_interval),
|
|
heartbeat_prompt = sqlc.arg(heartbeat_prompt),
|
|
compaction_enabled = sqlc.arg(compaction_enabled),
|
|
compaction_threshold = sqlc.arg(compaction_threshold),
|
|
compaction_ratio = sqlc.arg(compaction_ratio),
|
|
chat_model_id = COALESCE(sqlc.narg(chat_model_id)::uuid, bots.chat_model_id),
|
|
heartbeat_model_id = COALESCE(sqlc.narg(heartbeat_model_id)::uuid, bots.heartbeat_model_id),
|
|
compaction_model_id = COALESCE(sqlc.narg(compaction_model_id)::uuid, bots.compaction_model_id),
|
|
title_model_id = COALESCE(sqlc.narg(title_model_id)::uuid, bots.title_model_id),
|
|
search_provider_id = COALESCE(sqlc.narg(search_provider_id)::uuid, bots.search_provider_id),
|
|
memory_provider_id = COALESCE(sqlc.narg(memory_provider_id)::uuid, bots.memory_provider_id),
|
|
image_model_id = COALESCE(sqlc.narg(image_model_id)::uuid, bots.image_model_id),
|
|
tts_model_id = COALESCE(sqlc.narg(tts_model_id)::uuid, bots.tts_model_id),
|
|
browser_context_id = COALESCE(sqlc.narg(browser_context_id)::uuid, bots.browser_context_id),
|
|
updated_at = now()
|
|
WHERE bots.id = sqlc.arg(id)
|
|
RETURNING bots.id, bots.language, bots.reasoning_enabled, bots.reasoning_effort, bots.heartbeat_enabled, bots.heartbeat_interval, bots.heartbeat_prompt, bots.compaction_enabled, bots.compaction_threshold, bots.compaction_ratio, bots.chat_model_id, bots.heartbeat_model_id, bots.compaction_model_id, bots.title_model_id, bots.image_model_id, bots.search_provider_id, bots.memory_provider_id, bots.tts_model_id, bots.browser_context_id
|
|
)
|
|
SELECT
|
|
updated.id AS bot_id,
|
|
updated.language,
|
|
updated.reasoning_enabled,
|
|
updated.reasoning_effort,
|
|
updated.heartbeat_enabled,
|
|
updated.heartbeat_interval,
|
|
updated.heartbeat_prompt,
|
|
updated.compaction_enabled,
|
|
updated.compaction_threshold,
|
|
updated.compaction_ratio,
|
|
chat_models.id AS chat_model_id,
|
|
heartbeat_models.id AS heartbeat_model_id,
|
|
compaction_models.id AS compaction_model_id,
|
|
title_models.id AS title_model_id,
|
|
search_providers.id AS search_provider_id,
|
|
memory_providers.id AS memory_provider_id,
|
|
image_models.id AS image_model_id,
|
|
tts_models.id AS tts_model_id,
|
|
browser_contexts.id AS browser_context_id
|
|
FROM updated
|
|
LEFT JOIN models AS chat_models ON chat_models.id = updated.chat_model_id
|
|
LEFT JOIN models AS heartbeat_models ON heartbeat_models.id = updated.heartbeat_model_id
|
|
LEFT JOIN models AS compaction_models ON compaction_models.id = updated.compaction_model_id
|
|
LEFT JOIN models AS title_models ON title_models.id = updated.title_model_id
|
|
LEFT JOIN models AS image_models ON image_models.id = updated.image_model_id
|
|
LEFT JOIN search_providers ON search_providers.id = updated.search_provider_id
|
|
LEFT JOIN memory_providers ON memory_providers.id = updated.memory_provider_id
|
|
LEFT JOIN models AS tts_models ON tts_models.id = updated.tts_model_id
|
|
LEFT JOIN browser_contexts ON browser_contexts.id = updated.browser_context_id;
|
|
|
|
-- name: DeleteSettingsByBotID :exec
|
|
UPDATE bots
|
|
SET language = 'auto',
|
|
reasoning_enabled = false,
|
|
reasoning_effort = 'medium',
|
|
heartbeat_enabled = false,
|
|
heartbeat_interval = 30,
|
|
heartbeat_prompt = '',
|
|
compaction_enabled = false,
|
|
compaction_threshold = 100000,
|
|
compaction_ratio = 80,
|
|
chat_model_id = NULL,
|
|
heartbeat_model_id = NULL,
|
|
compaction_model_id = NULL,
|
|
title_model_id = NULL,
|
|
image_model_id = NULL,
|
|
search_provider_id = NULL,
|
|
memory_provider_id = NULL,
|
|
tts_model_id = NULL,
|
|
browser_context_id = NULL,
|
|
updated_at = now()
|
|
WHERE id = $1;
|