seewe/sub2api
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-14 12:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6599 from wucm667/fix/issue-6598-gemini-custom-models-list

Browse Source 
fix(gemini): apply custom list to native models endpoint
This commit is contained in:
Wesley Liddick
2026-09-05 15:03:08 +08:00
committed by GitHub
parent 570bd084c2 28f673e4cd
commit 2ad6e8fb75
6 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/handler/gemini_v1beta_handler.go
+16
View File
@@ -52,6 +52,11 @@ func (h *GatewayHandler) GeminiV1BetaListModels(c *gin.Context) {
return
}
if models, ok := customGeminiModelsList(apiKey.Group); ok {
c.JSON(http.StatusOK, models)
return
}
account, err := h.geminiCompatService.SelectAccountForAIStudioEndpoints(c.Request.Context(), apiKey.GroupID)
if err != nil {
// 没有 gemini 账户，检查是否有 antigravity 账户可用
@@ -78,6 +83,17 @@ func (h *GatewayHandler) GeminiV1BetaListModels(c *gin.Context) {
writeUpstreamResponse(c, res)
}
func customGeminiModelsList(group *service.Group) (gemini.ModelsListResponse, bool) {
if group == nil || !group.CustomModelsListEnabled() {
return gemini.ModelsListResponse{}, false
}
models := make([]gemini.Model, 0, len(group.ModelsListConfig.Models))
for _, modelID := range group.ModelsListConfig.Models {
models = append(models, gemini.FallbackModel(modelID))
}
return gemini.ModelsListResponse{Models: models}, true
}
// GeminiV1BetaGetModel proxies:
// GET /v1beta/models/{model}
func (h *GatewayHandler) GeminiV1BetaGetModel(c *gin.Context) {
backend/internal/handler/gemini_v1beta_handler_test.go
+68
View File
@@ -3,13 +3,81 @@
package handler
import (
"encoding/json"
"net/http"
"net/http/httptest"
"testing"
"github.com/Wei-Shaw/sub2api/internal/pkg/antigravity"
"github.com/Wei-Shaw/sub2api/internal/pkg/gemini"
"github.com/Wei-Shaw/sub2api/internal/server/middleware"
"github.com/Wei-Shaw/sub2api/internal/service"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/require"
)
func TestGeminiV1BetaListModels_CustomGroupListUsesNativeResponse(t *testing.T) {
gin.SetMode(gin.TestMode)
rec := httptest.NewRecorder()
c, _ := gin.CreateTestContext(rec)
c.Request = httptest.NewRequest(http.MethodGet, "/v1beta/models", nil)
c.Set(string(middleware.ContextKeyAPIKey), &service.APIKey{
Group: &service.Group{
Platform: service.PlatformGemini,
ModelsListConfig: service.GroupModelsListConfig{
Enabled: true,
Models: []string{"gemini-2.5-pro", "models/gemini-custom"},
},
},
})
(&GatewayHandler{}).GeminiV1BetaListModels(c)
require.Equal(t, http.StatusOK, rec.Code)
var got gemini.ModelsListResponse
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &got))
require.Equal(t, []gemini.Model{
gemini.FallbackModel("gemini-2.5-pro"),
gemini.FallbackModel("models/gemini-custom"),
}, got.Models)
}
func TestGeminiV1BetaListModels_ForcedAntigravityIgnoresCustomGroupList(t *testing.T) {
gin.SetMode(gin.TestMode)
rec := httptest.NewRecorder()
c, _ := gin.CreateTestContext(rec)
c.Request = httptest.NewRequest(http.MethodGet, "/antigravity/v1beta/models", nil)
c.Set(string(middleware.ContextKeyAPIKey), &service.APIKey{
Group: &service.Group{
Platform: service.PlatformGemini,
ModelsListConfig: service.GroupModelsListConfig{
Enabled: true,
Models: []string{"gemini-custom"},
},
},
})
c.Set(string(middleware.ContextKeyForcePlatform), service.PlatformAntigravity)
(&GatewayHandler{}).GeminiV1BetaListModels(c)
require.Equal(t, http.StatusOK, rec.Code)
var got antigravity.GeminiModelsListResponse
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &got))
require.Equal(t, antigravity.FallbackGeminiModelsList(), got)
}
func TestCustomGeminiModelsList_DisabledKeepsExistingFlow(t *testing.T) {
group := &service.Group{
ModelsListConfig: service.GroupModelsListConfig{
Enabled: false,
Models: []string{"gemini-2.5-pro"},
},
}
_, ok := customGeminiModelsList(group)
require.False(t, ok)
}
// TestGeminiV1BetaHandler_PlatformRoutingInvariant 文档化并验证 Handler 层的平台路由逻辑不变量
// 该测试确保 gemini 和 antigravity 平台的路由逻辑符合预期
func TestGeminiV1BetaHandler_PlatformRoutingInvariant(t *testing.T) {
frontend/src/i18n/locales/en/admin/overview.ts
+2 -2
View File
@@ -1070,8 +1070,8 @@ export default {
sumTooHigh: 'Min gross margin plus safety buffer must be less than 100%, otherwise every account would be excluded'
},
modelsList: {
title: 'Custom /v1/models Model List',
hint: 'Only changes the /v1/models response. Whitelist model calls and account routing are unchanged.',
title: 'Custom {endpoint} Model List',
hint: 'Only changes the {endpoint} response. Whitelist model calls and account routing are unchanged.',
loading: 'Loading model list...',
empty: 'No displayable models',
selectedSummary: 'Selected {selected} / {total}',
frontend/src/i18n/locales/zh/admin/overview.ts
+2 -2
View File
@@ -1067,8 +1067,8 @@ export default {
sumTooHigh: '最低毛利率与安全缓冲之和必须小于 100%，否则将排除全部账号'
},
modelsList: {
title: '自定义 /v1/models 模型列表',
hint: '仅影响 /v1/models 展示结果，不影响白名单模型调用和账号调度。',
title: '自定义 {endpoint} 模型列表',
hint: '仅影响 {endpoint} 展示结果，不影响白名单模型调用和账号调度。',
loading: '正在加载模型列表...',
empty: '暂无可展示模型',
selectedSummary: '已选 {selected} / {total}',
frontend/src/views/admin/GroupsView.vue
+6 -4
View File
@@ -775,10 +775,10 @@
<div class="mb-3 flex items-center justify-between gap-3">
<div>
<label class="text-sm font-medium text-gray-700 dark:text-gray-300">
{{ t("admin.groups.modelsList.title") }}
{{ t("admin.groups.modelsList.title", { endpoint: modelsListEndpoint(createForm.platform) }) }}
</label>
<p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
{{ t("admin.groups.modelsList.hint") }}
{{ t("admin.groups.modelsList.hint", { endpoint: modelsListEndpoint(createForm.platform) }) }}
</p>
</div>
<button
@@ -2576,10 +2576,10 @@
<div class="mb-3 flex items-center justify-between gap-3">
<div>
<label class="text-sm font-medium text-gray-700 dark:text-gray-300">
{{ t("admin.groups.modelsList.title") }}
{{ t("admin.groups.modelsList.title", { endpoint: modelsListEndpoint(editForm.platform) }) }}
</label>
<p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
{{ t("admin.groups.modelsList.hint") }}
{{ t("admin.groups.modelsList.hint", { endpoint: modelsListEndpoint(editForm.platform) }) }}
</p>
</div>
<button
@@ -5178,6 +5178,8 @@ const createMessagesDispatchDefaults = createDefaultMessagesDispatchFormState();
const editMessagesDispatchDefaults = createDefaultMessagesDispatchFormState();
const createModelsListState = reactive(createInitialModelsListState());
const editModelsListState = reactive(createInitialModelsListState());
const modelsListEndpoint = (platform: string) =>
platform === "gemini" ? "/v1beta/models" : "/v1/models";
const createModelsListLoading = ref(false);
const editModelsListLoading = ref(false);
type ReasoningEffortPolicyFieldsExpose = {
frontend/src/views/admin/__tests__/groupsModelsListLayout.spec.ts
+12
View File
@@ -23,4 +23,16 @@ describe("groups models list layout", () => {
"btn btn-secondary shrink-0 whitespace-nowrap",
);
});
it("uses the Gemini-native models endpoint in Gemini group copy", () => {
expect(groupsViewSource).toContain(
'platform === "gemini" ? "/v1beta/models" : "/v1/models"',
);
expect(groupsViewSource).toContain(
"modelsListEndpoint(createForm.platform)",
);
expect(groupsViewSource).toContain(
"modelsListEndpoint(editForm.platform)",
);
});
});