diff --git a/control-plane-java/src/main/resources/db/migration/V14__relay_model_catalog.sql b/control-plane-java/src/main/resources/db/migration/V14__relay_model_catalog.sql index 1c63521..faf723a 100644 --- a/control-plane-java/src/main/resources/db/migration/V14__relay_model_catalog.sql +++ b/control-plane-java/src/main/resources/db/migration/V14__relay_model_catalog.sql @@ -14,6 +14,18 @@ DECLARE provider_id_value text; logical_id_value text; 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', + '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', + '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', @@ -115,15 +127,21 @@ BEGIN SELECT 'relay-def-' || md5(provider_code || ':' || model_name), 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); + WHERE NOT EXISTS (SELECT 1 FROM model_definitions WHERE model_key = model_name AND deleted_at IS NULL); - SELECT id INTO logical_id_value FROM model_definitions WHERE model_key = model_name ORDER BY created_at LIMIT 1; + 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 (SELECT 1 FROM model_catalog mc WHERE mc.logical_model_id = logical_id_value AND mc.source_label = group_label AND mc.deleted_at IS NULL); + WHERE 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 + ); END IF; END LOOP; END LOOP; diff --git a/docs/15-relay-onboarding.md b/docs/15-relay-onboarding.md index 9da64b5..a6f3032 100644 --- a/docs/15-relay-onboarding.md +++ b/docs/15-relay-onboarding.md @@ -22,7 +22,7 @@ | 字段 | ApiHub 国内 | TokenFoundryX 国外 | APIPro | |---|---|---|---| -| 渠道 Code | 现有 `apihub` | `tokenfoundryx-global` | `apipro` | +| 渠道 Code | 现有 `apihub` | `tokenfoundryx` | `apipro` | | 渠道名称 | 现有“内测1” | TokenFoundryX 国外 | APIPro | | 来源类型 | 中转站 | 中转站 | 中转站 | | 接入协议 | OpenAI 兼容 | OpenAI 兼容(用于其聊天端点) | OpenAI 兼容 |