Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix(web): show api key before base url in every model provider form (#20361)

chanx66fb8d038fab
diff --git a/web/src/pages/user-setting/setting-model/provider-schema/field-config/local-llm-configs.ts b/web/src/pages/user-setting/setting-model/provider-schema/field-config/local-llm-configs.ts
index 5c5e85540f..a576a83350 100644
--- a/web/src/pages/user-setting/setting-model/provider-schema/field-config/local-llm-configs.ts
+++ b/web/src/pages/user-setting/setting-model/provider-schema/field-config/local-llm-configs.ts
@@ -241,15 +241,6 @@ function buildLocalConfig(
// required: true,
// placeholder: 'modelNameMessage',
// },
- {
- name: 'base_url',
- label: 'addLlmBaseUrl',
- type: 'inputSelect',
- required: true,
- placeholder: 'baseUrlNameMessage',
- autoComplete: 'new-password',
- shouldRender: 'hideWhenInstanceExists',
- },
{
name: 'api_key',
label: 'apiKey',
@@ -259,6 +250,15 @@ function buildLocalConfig(
autoComplete: 'new-password',
shouldRender: 'hideWhenInstanceExists',
},
+ {
+ name: 'base_url',
+ label: 'addLlmBaseUrl',
+ type: 'inputSelect',
+ required: true,
+ placeholder: 'baseUrlNameMessage',
+ autoComplete: 'new-password',
+ shouldRender: 'hideWhenInstanceExists',
+ },
// {
// name: 'max_tokens',
// label: 'maxTokens',
diff --git a/web/src/pages/user-setting/setting-model/provider-schema/field-config/provider-config-map.ts b/web/src/pages/user-setting/setting-model/provider-schema/field-config/provider-config-map.ts
index 58aa7e9205..12519af546 100644
--- a/web/src/pages/user-setting/setting-model/provider-schema/field-config/provider-config-map.ts
+++ b/web/src/pages/user-setting/setting-model/provider-schema/field-config/provider-config-map.ts
@@ -52,15 +52,6 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
tooltip: 'instanceNameTip',
validation: { message: 'instanceNameMessage' },
},
- {
- name: 'base_url',
- label: 'addLlmBaseUrl',
- type: 'inputSelect',
- required: true,
- placeholder: 'baseUrlNameMessage',
- shouldRender: 'hideWhenInstanceExists',
- validation: { message: 'baseUrlNameMessage' },
- },
{
name: 'api_key',
label: 'apiKey',
@@ -70,6 +61,15 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
shouldRender: 'hideWhenInstanceExists',
validation: { message: 'apiKeyMessage' },
},
+ {
+ name: 'base_url',
+ label: 'addLlmBaseUrl',
+ type: 'inputSelect',
+ required: true,
+ placeholder: 'baseUrlNameMessage',
+ shouldRender: 'hideWhenInstanceExists',
+ validation: { message: 'baseUrlNameMessage' },
+ },
{
name: 'api_version',
label: 'apiVersion',
@@ -443,6 +443,13 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
tooltip: 'instanceNameTip',
validation: { message: 'instanceNameMessage' },
},
+ {
+ name: 'opendataloader_api_key',
+ label: 'apiKey',
+ type: FormFieldType.Password,
+ required: false,
+ placeholder: 'apiKeyPlaceholder',
+ },
{
name: 'opendataloader_apiserver',
label: 'baseUrl',
@@ -451,13 +458,6 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
placeholder: 'opendataloaderApiserverPlaceholder',
validation: { message: 'opendataloaderApiserverMessage' },
},
- {
- name: 'opendataloader_api_key',
- label: 'apiKey',
- type: FormFieldType.Password,
- required: false,
- placeholder: 'apiKeyPlaceholder',
- },
],
verifyTransform: (values) => {
const cfg: Record<string, any> = {};
@@ -512,15 +512,6 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
tooltip: 'instanceNameTip',
validation: { message: 'instanceNameMessage' },
},
- {
- name: 'paddleocr_api_url',
- label: 'paddleocrApiUrl',
- type: 'inputSelect',
- required: true,
- placeholder: 'paddleocrApiUrlPlaceholder',
- autoComplete: 'new-password',
- validation: { message: 'paddleocrApiUrlMessage' },
- },
{
name: 'paddleocr_access_token',
label: 'paddleocrAccessToken',
@@ -530,6 +521,15 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
autoComplete: 'new-password',
validation: { message: 'paddleocrAccessTokenMessage' },
},
+ {
+ name: 'paddleocr_api_url',
+ label: 'paddleocrApiUrl',
+ type: 'inputSelect',
+ required: true,
+ placeholder: 'paddleocrApiUrlPlaceholder',
+ autoComplete: 'new-password',
+ validation: { message: 'paddleocrApiUrlMessage' },
+ },
{
name: 'paddleocr_algorithm',
label: 'paddleocrAlgorithm',
@@ -601,15 +601,6 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
tooltip: 'instanceNameTip',
validation: { message: 'instanceNameMessage' },
},
- {
- name: 'paddleocr_api_url',
- label: 'paddleocrApiUrl',
- type: 'inputSelect',
- required: true,
- placeholder: 'paddleocrApiUrlPlaceholder',
- autoComplete: 'new-password',
- validation: { message: 'paddleocrApiUrlMessage' },
- },
{
name: 'paddleocr_access_token',
label: 'paddleocrAccessToken',
@@ -619,6 +610,15 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
autoComplete: 'new-password',
validation: { message: 'paddleocrAccessTokenMessage' },
},
+ {
+ name: 'paddleocr_api_url',
+ label: 'paddleocrApiUrl',
+ type: 'inputSelect',
+ required: true,
+ placeholder: 'paddleocrApiUrlPlaceholder',
+ autoComplete: 'new-password',
+ validation: { message: 'paddleocrApiUrlMessage' },
+ },
],
verifyTransform: (values) => ({
apiKey: values.paddleocr_access_token ?? '',
@@ -744,6 +744,14 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
tooltip: 'instanceNameTip',
validation: { message: 'instanceNameMessage' },
},
+ {
+ name: 'api_key',
+ label: 'somark.apiKey',
+ type: FormFieldType.Password,
+ required: false,
+ placeholder: 'somark.apiKeyPlaceholder',
+ shouldRender: 'hideWhenInstanceExists',
+ },
{
name: 'base_url',
label: 'somark.baseUrl',
@@ -753,14 +761,6 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
shouldRender: 'hideWhenInstanceExists',
validation: { message: 'somark.baseUrlMessage' },
},
- {
- name: 'api_key',
- label: 'somark.apiKey',
- type: FormFieldType.Password,
- required: false,
- placeholder: 'somark.apiKeyPlaceholder',
- shouldRender: 'hideWhenInstanceExists',
- },
],
verifyTransform: (values) => ({
apiKey: values.api_key ?? '',