Merge pull request #944 from lamcodes/main

Update: Gemini channel fetch_models

controller/channel-test.go

@@ -192,6 +192,8 @@ func buildTestRequest(model string) *dto.GeneralOpenAIRequest {
 		if !strings.Contains(model, "claude") {
 			testRequest.MaxTokens = 50
 		}
+	} else if strings.Contains(model, "gemini") {
+		testRequest.MaxTokens = 300
 	} else {
 		testRequest.MaxTokens = 10
 	}

controller/channel.go

@@ -119,6 +119,9 @@ func FetchUpstreamModels(c *gin.Context) {
 		baseURL = channel.GetBaseURL()
 	}
 	url := fmt.Sprintf("%s/v1/models", baseURL)
+	if channel.Type == common.ChannelTypeGemini {
+		url = fmt.Sprintf("%s/v1beta/openai/models", baseURL)
+	}
 	body, err := GetResponseBody("GET", url, channel, GetAuthHeader(channel.Key))
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -139,7 +142,11 @@ func FetchUpstreamModels(c *gin.Context) {
 
 	var ids []string
 	for _, model := range result.Data {
-		ids = append(ids, model.ID)
+		id := model.ID
+		if channel.Type == common.ChannelTypeGemini {
+			id = strings.TrimPrefix(id, "models/")
+		}
+		ids = append(ids, id)
 	}
 
 	c.JSON(http.StatusOK, gin.H{

main.go

@@ -52,6 +52,9 @@ func main() {
 	if err != nil {
 		common.FatalLog("failed to initialize database: " + err.Error())
 	}
+
+	model.CheckSetup()
+
 	// Initialize SQL Database
 	err = model.InitLogDB()
 	if err != nil {
@@ -70,13 +73,13 @@ func main() {
 		common.FatalLog("failed to initialize Redis: " + err.Error())
 	}
 
+	// Initialize model settings
+	operation_setting.InitModelSettings()
 	// Initialize constants
 	constant.InitEnv()
 	// Initialize options
 	model.InitOptionMap()
-	// Initialize model settings
-	operation_setting.InitModelSettings()
-	
+
 	if common.RedisEnabled {
 		// for compatibility with old versions
 		common.MemoryCacheEnabled = true

model/main.go

@@ -56,7 +56,7 @@ func createRootAccountIfNeed() error {
 	return nil
 }
 
-func checkSetup() {
+func CheckSetup() {
 	setup := GetSetup()
 	if setup == nil {
 		// No setup record exists, check if we have a root user
@@ -244,7 +244,6 @@ func migrateDB() error {
 	}
 	err = DB.AutoMigrate(&Setup{})
 	common.SysLog("database migrated")
-	checkSetup()
 	//err = createRootAccountIfNeed()
 	return err
 }

setting/operation_setting/model-ratio.go

@@ -134,8 +134,8 @@ var defaultModelRatio = map[string]float64{
 	"gemini-1.5-pro-latest":               1.25, // $3.5 / 1M tokens
 	"gemini-1.5-flash-latest":             0.075,
 	"gemini-2.0-flash":                    0.05,
-	"gemini-2.5-pro-exp-03-25":            1.25,
-	"gemini-2.5-pro-preview-03-25":        1.25,
+	"gemini-2.5-pro-exp-03-25":            0.625,
+	"gemini-2.5-pro-preview-03-25":        0.625,
 	"text-embedding-004":                  0.001,
 	"chatglm_turbo":                       0.3572,     // ￥0.005 / 1k tokens
 	"chatglm_pro":                         0.7143,     // ￥0.01 / 1k tokens
@@ -449,7 +449,7 @@ func getHardcodedCompletionModelRatio(name string) (float64, bool) {
 		} else if strings.HasPrefix(name, "gemini-2.0") {
 			return 4, true
 		} else if strings.HasPrefix(name, "gemini-2.5-pro-preview") {
-			return 6, true
+			return 8, true
 		}
 		return 4, false
 	}

web/src/components/SystemSetting.js

@@ -619,7 +619,7 @@ const SystemSetting = () => {
                       允许通过 Telegram 进行登录
                     </Form.Checkbox>
                     <Form.Checkbox
-                      field='oidc.enabled'
+                      field="['oidc.enabled']"
                       noLabel
                       onChange={(e) => handleCheckboxChange('oidc.enabled', e)}
                     >
@@ -721,14 +721,14 @@ const SystemSetting = () => {
                 <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 24, xl: 24, xxl: 24 }}>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.well_known'
+                      field="['oidc.well_known']"
                       label='Well-Known URL'
                       placeholder='请输入 OIDC 的 Well-Known URL'
                     />
                   </Col>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.client_id'
+                      field="['oidc.client_id']"
                       label='Client ID'
                       placeholder='输入 OIDC 的 Client ID'
                     />
@@ -737,7 +737,7 @@ const SystemSetting = () => {
                 <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 24, xl: 24, xxl: 24 }}>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.client_secret'
+                      field="['oidc.client_secret']"
                       label='Client Secret'
                       type='password'
                       placeholder='敏感信息不会发送到前端显示'
@@ -745,7 +745,7 @@ const SystemSetting = () => {
                   </Col>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.authorization_endpoint'
+                      field="['oidc.authorization_endpoint']"
                       label='Authorization Endpoint'
                       placeholder='输入 OIDC 的 Authorization Endpoint'
                     />
@@ -754,14 +754,14 @@ const SystemSetting = () => {
                 <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 24, xl: 24, xxl: 24 }}>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.token_endpoint'
+                      field="['oidc.token_endpoint']"
                       label='Token Endpoint'
                       placeholder='输入 OIDC 的 Token Endpoint'
                     />
                   </Col>
                   <Col xs={24} sm={24} md={12} lg={12} xl={12}>
                     <Form.Input
-                      field='oidc.user_info_endpoint'
+                      field="['oidc.user_info_endpoint']"
                       label='User Info Endpoint'
                       placeholder='输入 OIDC 的 Userinfo Endpoint'
                     />

web/src/i18n/locales/en.json

@@ -514,7 +514,7 @@
   "，图片演示。": "related image demo.",
   "令牌创建成功，请在列表页面点击复制获取令牌！": "Token created successfully, please click copy on the list page to get the token!",
   "代理": "Proxy",
-  "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com": "This is optional, used to make API calls through the proxy site, please enter the proxy site address, the format is: https://domain.com",
+  "此项可选，用于通过自定义API地址来进行 API 调用，请输入API地址，格式为：https://domain.com": "This is optional, used to make API calls through the proxy site, please enter the proxy site address, the format is: https://domain.com",
   "取消密码登录将导致所有未绑定其他登录方式的用户（包括管理员）无法通过密码登录，确认取消？": "Canceling password login will cause all users (including administrators) who have not bound other login methods to be unable to log in via password, confirm cancel?",
   "按照如下格式输入：": "Enter in the following format:",
   "模型版本": "Model version",
@@ -1111,7 +1111,7 @@
   "如果你对接的是上游One API或者New API等转发项目，请使用OpenAI类型，不要使用此类型，除非你知道你在做什么。": "If you are connecting to upstream One API or New API forwarding projects, please use OpenAI type. Do not use this type unless you know what you are doing.",
   "完整的 Base URL，支持变量{model}": "Complete Base URL, supports variable {model}",
   "请输入完整的URL，例如：https://api.openai.com/v1/chat/completions": "Please enter complete URL, e.g.: https://api.openai.com/v1/chat/completions",
-  "此项可选，用于通过代理站来进行 API 调用，末尾不要带/v1和/": "Optional for API calls through proxy sites, do not end with /v1 and /",
+  "此项可选，用于通过自定义API地址来进行 API 调用，末尾不要带/v1和/": "Optional for API calls through custom API address, do not add /v1 and / at the end",
   "私有部署地址": "Private Deployment Address",
   "请输入私有部署地址，格式为：https://fastgpt.run/api/openapi": "Please enter private deployment address, format: https://fastgpt.run/api/openapi",
   "注意非Chat API，请务必填写正确的API地址，否则可能导致无法使用": "Note: For non-Chat API, please make sure to enter the correct API address, otherwise it may not work",
@@ -1272,7 +1272,7 @@
   "通知邮箱": "Notification email",
   "设置用于接收额度预警的邮箱地址，不填则使用账号绑定的邮箱": "Set the email address for receiving quota warning notifications, if not set, the email address bound to the account will be used",
   "留空则使用账号绑定的邮箱": "If left blank, the email address bound to the account will be used",
-  "代理站地址": "Base URL",
+  "API地址": "Base URL",
   "对于官方渠道，new-api已经内置地址，除非是第三方代理站点或者Azure的特殊接入地址，否则不需要填写": "For official channels, the new-api has a built-in address. Unless it is a third-party proxy site or a special Azure access address, there is no need to fill it in",
   "渠道额外设置": "Channel extra settings",
   "参数覆盖": "Parameters override",

web/src/pages/Channel/EditChannel.js

@@ -556,13 +556,13 @@ const EditChannel = (props) => {
           {inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && inputs.type !== 36 && inputs.type !== 45 && (
             <>
               <div style={{ marginTop: 10 }}>
-                <Typography.Text strong>{t('代理站地址')}：</Typography.Text>
+                <Typography.Text strong>{t('API地址')}：</Typography.Text>
               </div>
               <Tooltip content={t('对于官方渠道，new-api已经内置地址，除非是第三方代理站点或者Azure的特殊接入地址，否则不需要填写')}>
                 <Input
-                  label={t('代理站地址')}
+                  label={t('API地址')}
                   name="base_url"
-                  placeholder={t('此项可选，用于通过代理站来进行 API 调用，末尾不要带/v1和/')}
+                  placeholder={t('此项可选，用于通过自定义API地址来进行 API 调用，末尾不要带/v1和/')}
                   onChange={(value) => {
                     handleInputChange('base_url', value);
                   }}