diff --git a/frontend/src/components/ModelEditorDialog.vue b/frontend/src/components/ModelEditorDialog.vue index 7d747553..ef13d019 100644 --- a/frontend/src/components/ModelEditorDialog.vue +++ b/frontend/src/components/ModelEditorDialog.vue @@ -230,8 +230,8 @@

- -
+ +
diff --git a/frontend/src/views/settings/ModelSettings.vue b/frontend/src/views/settings/ModelSettings.vue index a62a9c8a..b8d2b398 100644 --- a/frontend/src/views/settings/ModelSettings.vue +++ b/frontend/src/views/settings/ModelSettings.vue @@ -249,37 +249,29 @@ const loading = ref(true) // 模型列表数据 const allModels = ref([]) -// 根据类型过滤并去重模型 +// 根据类型过滤模型 const chatModels = computed(() => - deduplicateModels( - allModels.value - .filter(m => m.type === 'KnowledgeQA') - .map(convertToLegacyFormat) - ) + allModels.value + .filter(m => m.type === 'KnowledgeQA') + .map(convertToLegacyFormat) ) const embeddingModels = computed(() => - deduplicateModels( - allModels.value - .filter(m => m.type === 'Embedding') - .map(convertToLegacyFormat) - ) + allModels.value + .filter(m => m.type === 'Embedding') + .map(convertToLegacyFormat) ) const rerankModels = computed(() => - deduplicateModels( - allModels.value - .filter(m => m.type === 'Rerank') - .map(convertToLegacyFormat) - ) + allModels.value + .filter(m => m.type === 'Rerank') + .map(convertToLegacyFormat) ) const vllmModels = computed(() => - deduplicateModels( - allModels.value - .filter(m => m.type === 'VLLM') - .map(convertToLegacyFormat) - ) + allModels.value + .filter(m => m.type === 'VLLM') + .map(convertToLegacyFormat) ) // 将后端模型格式转换为旧的前端格式 @@ -298,30 +290,6 @@ function convertToLegacyFormat(model: ModelConfig) { } } -// 去重函数:比较除id外的所有字段,相同的只保留第一个 -function deduplicateModels(models: any[]) { - const seen = new Map() - - return models.filter(model => { - // 创建一个不包含id的签名用于比较 - const signature = JSON.stringify({ - name: model.name, - source: model.source, - modelName: model.modelName, - baseUrl: model.baseUrl, - apiKey: model.apiKey, - dimension: model.dimension - }) - - if (seen.has(signature)) { - return false - } - - seen.set(signature, model) - return true - }) -} - // 加载模型列表 const loadModels = async () => { loading.value = true @@ -410,7 +378,9 @@ const handleModelSave = async (modelData: any) => { truncate_prompt_tokens: 0 } } : {}), - ...((currentModelType.value === 'chat' || currentModelType.value === 'vllm') ? { + ...(currentModelType.value === 'vllm' ? { + supports_vision: true + } : currentModelType.value === 'chat' ? { supports_vision: modelData.supportsVision ?? false } : {}) } diff --git a/internal/handler/model.go b/internal/handler/model.go index 69e05376..0b0b49d1 100644 --- a/internal/handler/model.go +++ b/internal/handler/model.go @@ -301,18 +301,22 @@ func (h *ModelHandler) UpdateModel(c *gin.Context) { model.Name = req.Name } model.Description = req.Description - // Check if any Parameters field is set (can't use struct comparison due to map field) - if req.Parameters.BaseURL != "" || req.Parameters.APIKey != "" || req.Parameters.Provider != "" { - // SSRF validation for updated model BaseURL - if req.Parameters.BaseURL != "" { - if err := secutils.ValidateURLForSSRF(req.Parameters.BaseURL); err != nil { - logger.Warnf(ctx, "SSRF validation failed for model BaseURL: %v", err) - c.Error(errors.NewBadRequestError(fmt.Sprintf("Base URL 未通过安全校验: %v", err))) - return - } + + // SSRF validation for updated model BaseURL + if req.Parameters.BaseURL != "" { + if err := secutils.ValidateURLForSSRF(req.Parameters.BaseURL); err != nil { + logger.Warnf(ctx, "SSRF validation failed for model BaseURL: %v", err) + c.Error(errors.NewBadRequestError(fmt.Sprintf("Base URL 未通过安全校验: %v", err))) + return } - model.Parameters = req.Parameters } + // Preserve backend-managed fields not sent by frontend + req.Parameters.ParameterSize = model.Parameters.ParameterSize + if req.Parameters.ExtraConfig == nil { + req.Parameters.ExtraConfig = model.Parameters.ExtraConfig + } + model.Parameters = req.Parameters + model.Source = req.Source model.Type = req.Type