fix(llm渠道): 龙抬头模型 id 切 gm-3.5-flash-lite——贞贞仍留 3.1,映射仍走 LlmChannel 单出口
2026-11-09 用户口径:龙抬头那家中转把同款模型统一叫 gm-3.5-flash-lite(旧值 gemini-3.1-flash-lite 已不存在)。业务配置里写的仍是贞贞的 gemini-3.1-flash-lite-preview-thinking-medium,渠道映射表改一处,三条取用点(外观专利/相似ASIN/密钥检测)与示例配置注释同步;切渠道不映射就会 model_not_found。判据 LlmChannelProxyProviderTest 两支断言随改。
This commit is contained in:
+1
-1
@@ -753,7 +753,7 @@ public class AppearancePatentLlmClient {
|
||||
recordSecretUsage();
|
||||
Map<String, Object> body = buildChatBody(model, system, userText, images, responseFormat);
|
||||
String host = resolveHost();
|
||||
// 渠道模型映射:龙抬头那边的同款模型叫 gemini-3.1-flash-lite,直接发贞贞的模型名会 model_not_found
|
||||
// 渠道模型映射:龙抬头那边统一叫 gm-3.5-flash-lite,直接发贞贞的模型名会 model_not_found
|
||||
String requestModel = LlmChannel.modelForHost(host, model);
|
||||
body.put("model", requestModel);
|
||||
// 思考参数按渠道补:贞贞把 thinking 写在模型名里,龙抬头要显式传(复刻现网的 thinking-medium)
|
||||
|
||||
+1
-1
@@ -188,7 +188,7 @@ public class SimilarAsinLlmClient {
|
||||
recordSecretUsage();
|
||||
Map<String, Object> body = buildChatBody(model, system, userText, images, responseFormat);
|
||||
String host = resolveHost();
|
||||
// 渠道模型映射:龙抬头那边的同款模型叫 gemini-3.1-flash-lite,直接发贞贞的模型名会 model_not_found
|
||||
// 渠道模型映射:龙抬头那边统一叫 gm-3.5-flash-lite,直接发贞贞的模型名会 model_not_found
|
||||
String requestModel = LlmChannel.modelForHost(host, model);
|
||||
body.put("model", requestModel);
|
||||
// 思考参数按渠道补:贞贞把 thinking 写在模型名里,龙抬头要显式传(复刻现网的 thinking-medium)
|
||||
|
||||
+1
-1
@@ -542,7 +542,7 @@ public class UserApiSecretCheckService {
|
||||
private CheckOutcome probeOnce(UserSecretModule module, String plainApiKey, String proxyUrl, boolean viaProxy,
|
||||
String channel) {
|
||||
String host = module.resolveLlmHost(appearancePatentProperties, similarAsinProperties, channel);
|
||||
// 检测也要按渠道换模型名:龙抬头那边叫 gemini-3.1-flash-lite,发贞贞的名字会 404/model_not_found,
|
||||
// 检测也要按渠道换模型名:龙抬头那边叫 gm-3.5-flash-lite,发贞贞的名字会 404/model_not_found,
|
||||
// 用户会误以为自己的密钥坏了
|
||||
String model = LlmChannel.modelForHost(host, userSecretProperties.getCheckModel());
|
||||
String url = joinUrl(host, "/v1/chat/completions");
|
||||
|
||||
+4
-3
@@ -14,7 +14,7 @@ import java.util.Locale;
|
||||
public enum LlmChannel {
|
||||
|
||||
LONGTAITOU("longtaitou", "龙抬头", "https://longtaitou.token6688.com",
|
||||
"gemini-3.1-flash-lite", true, "medium"),
|
||||
"gm-3.5-flash-lite", true, "medium"),
|
||||
T8STAR("t8star", "贞贞", "https://ai.t8star.org", null, false, null);
|
||||
|
||||
/** 新建配置的默认渠道(2026-10-30 用户拍板:默认仍是贞贞,龙抬头手动切)。 */
|
||||
@@ -27,8 +27,9 @@ public enum LlmChannel {
|
||||
* 该渠道上可路由的模型 id;null=沿用调用方配置的模型名。
|
||||
*
|
||||
* <p>两家中转的模型目录不同名:本系统业务配置写的是贞贞的
|
||||
* {@code gemini-3.1-flash-lite-preview-thinking-medium} 等,龙抬头那边同一个模型叫
|
||||
* {@code gemini-3.1-flash-lite}(2026-10-29 用户指定)。不映射直接切渠道会 model_not_found。</p>
|
||||
* {@code gemini-3.1-flash-lite-preview-thinking-medium} 等,龙抬头那边统一叫
|
||||
* {@code gm-3.5-flash-lite}(2026-11-09 用户指定:龙抬头切 3.5,贞贞仍留 3.1)。
|
||||
* 不映射直接切渠道会 model_not_found。</p>
|
||||
*/
|
||||
private final String defaultModel;
|
||||
/**
|
||||
|
||||
@@ -115,7 +115,7 @@ AIIMAGE_USER_SECRET_ADMIN_BALANCE_DEADLINE_MILLIS=10000
|
||||
# 以上 LLM 主机/模型是「贞贞」渠道的默认值(历史口径)。
|
||||
# 2026-10-29 起用户密钥可按人选择渠道(龙抬头 / 贞贞,默认贞贞,可手动切龙抬头):
|
||||
# - 渠道主机写死在 UserSecretModule/LlmChannel 里,不读本段;
|
||||
# - 手动切到龙抬头渠道后,模型 id 统一映射为 gemini-3.1-flash-lite,并显式补
|
||||
# - 手动切到龙抬头渠道后,模型 id 统一映射为 gm-3.5-flash-lite(2026-11-09 起,贞贞仍走 3.1),并显式补
|
||||
# enable_thinking=true + thinking_budget=medium(贞贞把 thinking 写在模型名里;
|
||||
# 不补这一对就等于给外观专利/货源查询降档。检测链路刻意不思考,只验连通);
|
||||
# - 用户没配密钥或迁移前遗留行没有 channel 时,才会回落到本段配置。
|
||||
|
||||
+3
-3
@@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
* 密钥「货源」维度:LLM 渠道(龙抬头/贞贞)与代理供应商(青果/极客)的归一化、默认值、主机与模型映射。
|
||||
*
|
||||
* <p>口径来源(2026-10-29 用户拍板):新建默认龙抬头 + 青果;存量由迁移 V180 回填贞贞/极客;
|
||||
* 龙抬头的模型 id 统一用 {@code gemini-3.1-flash-lite}。</p>
|
||||
* 龙抬头的模型 id 统一用 {@code gm-3.5-flash-lite}(2026-11-09 由 3.1 切到 3.5,贞贞不变)。</p>
|
||||
*/
|
||||
class LlmChannelProxyProviderTest {
|
||||
|
||||
@@ -39,7 +39,7 @@ class LlmChannelProxyProviderTest {
|
||||
void longtaitouUsesItsOwnModelId() {
|
||||
// 贞贞的模型名在龙抬头那边不存在,切渠道必须换 id,否则 model_not_found
|
||||
assertThat(LlmChannel.LONGTAITOU.modelFor("gemini-3.1-flash-lite-preview-thinking-medium"))
|
||||
.isEqualTo("gemini-3.1-flash-lite");
|
||||
.isEqualTo("gm-3.5-flash-lite");
|
||||
// 贞贞保持配置里的模型名原样
|
||||
assertThat(LlmChannel.T8STAR.modelFor("gemini-3.1-flash-lite-preview-thinking-medium"))
|
||||
.isEqualTo("gemini-3.1-flash-lite-preview-thinking-medium");
|
||||
@@ -48,7 +48,7 @@ class LlmChannelProxyProviderTest {
|
||||
@Test
|
||||
void modelMappingFollowsRequestHost() {
|
||||
assertThat(LlmChannel.modelForHost("https://longtaitou.token6688.com", "any-model"))
|
||||
.isEqualTo("gemini-3.1-flash-lite");
|
||||
.isEqualTo("gm-3.5-flash-lite");
|
||||
assertThat(LlmChannel.modelForHost("https://ai.t8star.org", "any-model")).isEqualTo("any-model");
|
||||
assertThat(LlmChannel.modelForHost(null, "any-model")).isEqualTo("any-model");
|
||||
assertThat(LlmChannel.modelForHost("https://unknown.example.com", "any-model")).isEqualTo("any-model");
|
||||
|
||||
Reference in New Issue
Block a user