Merge pull request #2895 from seefs001/fix/model-manager

fix: 如果模型管理有自定义配置则不合并默认配置

model/pricing.go

@@ -196,22 +196,27 @@ func updatePricing() {
 		modelSupportEndpointsStr[ability.Model] = endpoints
 		modelSupportEndpointsStr[ability.Model] = endpoints
 	}
 	}
 
 
-	// 再补充模型自定义端点
+	// 再补充模型自定义端点：若配置有效则替换默认端点，不做合并
 	for modelName, meta := range metaMap {
 	for modelName, meta := range metaMap {
 		if strings.TrimSpace(meta.Endpoints) == "" {
 		if strings.TrimSpace(meta.Endpoints) == "" {
 			continue
 			continue
 		}
 		}
 		var raw map[string]interface{}
 		var raw map[string]interface{}
 		if err := json.Unmarshal([]byte(meta.Endpoints), &raw); err == nil {
 		if err := json.Unmarshal([]byte(meta.Endpoints), &raw); err == nil {
-			endpoints := modelSupportEndpointsStr[modelName]
-			for k := range raw {
+			endpoints := make([]string, 0, len(raw))
+			for k, v := range raw {
+				switch v.(type) {
+				case string, map[string]interface{}:
 					if !common.StringsContains(endpoints, k) {
 					if !common.StringsContains(endpoints, k) {
 						endpoints = append(endpoints, k)
 						endpoints = append(endpoints, k)
 					}
 					}
 				}
 				}
+			}
+			if len(endpoints) > 0 {
 				modelSupportEndpointsStr[modelName] = endpoints
 				modelSupportEndpointsStr[modelName] = endpoints
 			}
 			}
 		}
 		}
+	}
 
 
 	modelSupportEndpointTypes = make(map[string][]constant.EndpointType)
 	modelSupportEndpointTypes = make(map[string][]constant.EndpointType)
 	for model, endpoints := range modelSupportEndpointsStr {
 	for model, endpoints := range modelSupportEndpointsStr {