fix: make relay catalog safe for existing routes
This commit is contained in:
1 parent
2d7255a5d3
commit
1a57de5bf9
2 files changed
+38
-19
No files matched your search
@@ -4,6 +4,8 @@ DO $$
|
||||
DECLARE
|
||||
provider_code text;
|
||||
group_label text;
|
||||
route_label text;
|
||||
group_suffix integer;
|
||||
model_names text[];
|
||||
model_name text;
|
||||
model_type text;
|
||||
@@ -17,18 +19,18 @@ BEGIN
|
||||
-- Keep the catalog complete even when one of the channels was not created
|
||||
-- manually. Existing rows (and therefore their credentials) are untouched.
|
||||
INSERT INTO model_providers (id, code, name, protocol, source_type, base_url, description, credential_type, status)
|
||||
SELECT 'relay-provider-apihub', 'apihub', 'ApiHub 国内', 'openai-compatible', 'relay',
|
||||
SELECT 'relay-provider-' || gen_random_uuid()::text, 'apihub', 'ApiHub 国内', 'openai-compatible', 'relay',
|
||||
'https://apihub.chem-cloud.cn/v1', 'ApiHub 国内中转站;等待管理员确认凭据。', 'api-key', 'disabled'
|
||||
WHERE NOT EXISTS (SELECT 1 FROM model_providers WHERE code = 'apihub' AND deleted_at IS NULL);
|
||||
|
||||
INSERT INTO model_providers (id, code, name, protocol, source_type, base_url, description, credential_type, status)
|
||||
SELECT 'relay-provider-apipro', 'apipro', 'APIPro', 'openai-compatible', 'relay',
|
||||
SELECT 'relay-provider-' || gen_random_uuid()::text, 'apipro', 'APIPro', 'openai-compatible', 'relay',
|
||||
'https://api.apipro.ai/v1', 'APIPro 中转站;等待管理员确认凭据。', 'api-key', 'disabled'
|
||||
WHERE NOT EXISTS (SELECT 1 FROM model_providers WHERE code = 'apipro' AND deleted_at IS NULL);
|
||||
|
||||
-- The TokenFoundryX channel is intentionally disabled until its API key is supplied.
|
||||
INSERT INTO model_providers (id, code, name, protocol, source_type, base_url, description, credential_type, status)
|
||||
SELECT 'provider-tokenfoundryx', 'tokenfoundryx', 'TokenFoundryX', 'openai-compatible', 'relay',
|
||||
SELECT 'relay-provider-' || gen_random_uuid()::text, 'tokenfoundryx', 'TokenFoundryX', 'openai-compatible', 'relay',
|
||||
'https://www.tokenfoundryx.com/v1', 'TokenFoundryX 海外中转站;等待管理员配置 API Key。', 'api-key', 'disabled'
|
||||
WHERE NOT EXISTS (SELECT 1 FROM model_providers WHERE code = 'tokenfoundryx' AND deleted_at IS NULL);
|
||||
|
||||
@@ -112,19 +114,22 @@ BEGIN
|
||||
FOREACH model_name IN ARRAY model_names LOOP
|
||||
model_type := CASE
|
||||
WHEN lower(model_name) LIKE '%embedding%' THEN 'embedding'
|
||||
WHEN lower(model_name) LIKE '%image%' OR lower(model_name) LIKE 'mj_%' OR lower(model_name) LIKE '%swap_face%' THEN 'image'
|
||||
WHEN lower(model_name) LIKE '%video%' OR lower(model_name) LIKE 'veo-%' OR lower(model_name) LIKE 'wan%' OR lower(model_name) LIKE '%seedance%' THEN 'video'
|
||||
WHEN lower(model_name) LIKE '%tts%' OR lower(model_name) LIKE '%whisper%' OR lower(model_name) LIKE 'suno_%' OR lower(model_name) LIKE 'lyria-%' THEN 'audio'
|
||||
WHEN lower(model_name) LIKE '%vl-%' OR lower(model_name) LIKE '%vision%' OR lower(model_name) LIKE '%omni%' THEN 'multimodal'
|
||||
WHEN lower(model_name) LIKE '%coder%' OR lower(model_name) LIKE '%codex%' THEN 'code'
|
||||
WHEN lower(model_name) LIKE '%image%' OR lower(model_name) LIKE '%seedream%' OR lower(model_name) LIKE 'mj_%' OR model_name = 'swap_face' THEN 'image'
|
||||
WHEN lower(model_name) LIKE '%tts%' OR lower(model_name) LIKE '%whisper%' OR lower(model_name) LIKE '%transcribe%' OR model_name = 'suno_music' OR lower(model_name) LIKE 'lyria-%' THEN 'audio'
|
||||
WHEN lower(model_name) LIKE '%vl-%' OR lower(model_name) LIKE '%vision%' OR lower(model_name) LIKE '%ocr%' OR lower(model_name) LIKE '%omni-flash%' THEN 'multimodal'
|
||||
WHEN lower(model_name) LIKE '%code%' THEN 'code'
|
||||
ELSE 'text' END;
|
||||
call_mode := CASE WHEN model_type IN ('image','audio','video','embedding') THEN 'async' ELSE 'sync' END;
|
||||
input_type := CASE WHEN model_type IN ('image','audio','video') THEN 'text' ELSE 'text' END;
|
||||
output_type := CASE WHEN model_type = 'image' THEN 'image' WHEN model_type = 'video' THEN 'video' WHEN model_type = 'audio' THEN 'audio' WHEN model_type = 'embedding' THEN 'vector' ELSE 'text' END;
|
||||
model_status := CASE WHEN model_name = 'codex-auto-review' OR provider_code = 'tokenfoundryx' THEN 'disabled' ELSE 'active' END;
|
||||
call_mode := CASE WHEN model_type = 'video' OR model_name LIKE 'mj_%' OR model_name IN ('suno_music', 'suno_lyrics') THEN 'async' ELSE 'sync' END;
|
||||
input_type := CASE WHEN model_name LIKE '%transcribe%' OR model_name LIKE '%whisper%' THEN 'audio'
|
||||
WHEN model_name LIKE '%ocr%' OR model_name = 'swap_face' THEN 'image' ELSE 'text' END;
|
||||
output_type := CASE WHEN input_type = 'audio' OR model_name IN ('mj_describe', 'mj_shorten') THEN 'text'
|
||||
WHEN model_type = 'image' THEN 'image' WHEN model_type = 'video' THEN 'video'
|
||||
WHEN model_type = 'audio' THEN 'audio' WHEN model_type = 'embedding' THEN 'vector' ELSE 'text' END;
|
||||
model_status := CASE WHEN model_name = 'codex-auto-review' OR strpos(model_name, '*') > 0 OR provider_code = 'tokenfoundryx' THEN 'disabled' ELSE 'active' END;
|
||||
|
||||
INSERT INTO model_definitions (id, model_key, public_name, model_type, call_mode, description, input_types, output_types, status)
|
||||
SELECT 'relay-def-' || md5(provider_code || ':' || model_name), model_name, model_name, model_type, call_mode,
|
||||
SELECT 'relay-def-' || gen_random_uuid()::text, model_name, model_name, model_type, call_mode,
|
||||
'来自 ' || group_label || ' 的模型目录;分组接入、协议和计费待验证。',
|
||||
jsonb_build_array(input_type), jsonb_build_array(output_type), model_status
|
||||
WHERE NOT EXISTS (SELECT 1 FROM model_definitions WHERE model_key = model_name AND deleted_at IS NULL);
|
||||
@@ -132,16 +137,26 @@ BEGIN
|
||||
SELECT id INTO logical_id_value FROM model_definitions WHERE model_key = model_name AND deleted_at IS NULL ORDER BY created_at LIMIT 1;
|
||||
SELECT id INTO provider_id_value FROM model_providers WHERE code = provider_code AND deleted_at IS NULL ORDER BY created_at LIMIT 1;
|
||||
IF logical_id_value IS NOT NULL AND provider_id_value IS NOT NULL THEN
|
||||
INSERT INTO model_catalog (id, provider_id, model_key, source_label, public_name, upstream_model, model_type, call_mode, description, input_types, output_types, capabilities, pricing, priority, max_concurrency, logical_model_id, status)
|
||||
SELECT 'relay-route-' || md5(provider_code || ':' || model_name), provider_id_value, model_name, group_label, model_name, model_name, model_type, call_mode,
|
||||
'来自 ' || group_label || ' 的模型目录;分组接入、协议和计费待验证。', jsonb_build_array(input_type), jsonb_build_array(output_type), '{}'::jsonb, NULL, 100, 1, logical_id_value, 'disabled'
|
||||
WHERE NOT EXISTS (
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM model_catalog mc
|
||||
WHERE mc.logical_model_id = logical_id_value
|
||||
AND mc.provider_id = provider_id_value
|
||||
AND mc.upstream_model = model_name
|
||||
AND mc.deleted_at IS NULL
|
||||
);
|
||||
) THEN
|
||||
route_label := group_label;
|
||||
group_suffix := 0;
|
||||
WHILE EXISTS (SELECT 1 FROM model_catalog mc WHERE mc.logical_model_id = logical_id_value
|
||||
AND mc.source_label = route_label AND mc.deleted_at IS NULL) LOOP
|
||||
group_suffix := group_suffix + 1;
|
||||
route_label := group_label || ' · 导入 ' || group_suffix;
|
||||
END LOOP;
|
||||
INSERT INTO model_catalog (id, provider_id, model_key, source_label, public_name, upstream_model, model_type, call_mode, description, input_types, output_types, capabilities, pricing, priority, max_concurrency, logical_model_id, status)
|
||||
SELECT 'relay-route-' || gen_random_uuid()::text, provider_id_value, model_name, route_label,
|
||||
d.public_name, model_name, d.model_type, d.call_mode, d.description, d.input_types, d.output_types,
|
||||
'{}'::jsonb, NULL, 100, 1, logical_id_value, 'disabled'
|
||||
FROM model_definitions d WHERE d.id = logical_id_value;
|
||||
END IF;
|
||||
END IF;
|
||||
END LOOP;
|
||||
END LOOP;
|
||||
|
||||
+6
-2
@@ -69,8 +69,12 @@ class PlatformAdminPostgresTest {
|
||||
jdbc.update("INSERT INTO users(id,account,account_kind,password_hash,display_name) VALUES (?,'legacy_member','username','not-a-login-hash','Legacy Member')", legacyUser);
|
||||
jdbc.update("INSERT INTO platform_api_keys(id,user_id,name,key_prefix,key_hash,model_ids) VALUES (?,?,'Legacy Key','test-prefix',?,?::jsonb)", legacyKey, legacyUser, "a".repeat(64), legacyGrants);
|
||||
Flyway.configure().dataSource(base).schemas(schema).defaultSchema(schema).load().migrate();
|
||||
assertEquals(legacyIds, jdbc.queryForList("SELECT id FROM model_catalog ORDER BY id", String.class));
|
||||
assertEquals(legacyIds, jdbc.queryForList("SELECT logical_model_id FROM model_catalog ORDER BY id", String.class));
|
||||
// V14 adds relay definitions/routes. Existing legacy routes and grants must survive
|
||||
// alongside the expanded catalog rather than making the catalog remain seven rows.
|
||||
assertTrue(jdbc.queryForList("SELECT id FROM model_catalog ORDER BY id", String.class).containsAll(legacyIds));
|
||||
for (String legacyId : legacyIds) {
|
||||
assertEquals(legacyId, jdbc.queryForObject("SELECT logical_model_id FROM model_catalog WHERE id=?", String.class, legacyId));
|
||||
}
|
||||
assertEquals(json.readTree(legacyGrants), json.readTree(jdbc.queryForObject("SELECT model_ids::text FROM platform_api_keys WHERE id=?", String.class, legacyKey)));
|
||||
context = new AnnotationConfigApplicationContext();
|
||||
sender = new TestSender();
|
||||
|
||||
Reference in new issue
Block a user