RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: handle redundant v1 in base_url (#20952)
Lynnbf6ec9c839bb
diff --git a/conf/models/gpustack.json b/conf/models/gpustack.jsonindex c555e56752..d02fbfa023 100644--- a/conf/models/gpustack.json+++ b/conf/models/gpustack.json@@ -5,6 +5,6 @@"models": "v1/models","embedding": "v1-openai/embeddings"},- "url_hint": "http://host.docker.internal:80/v1",+ "url_hint": "http://host.docker.internal:80","class": "local"}diff --git a/internal/entity/models/302ai.go b/internal/entity/models/302ai.goindex 7ead25b986..87ee8c2015 100644--- a/internal/entity/models/302ai.go+++ b/internal/entity/models/302ai.go@@ -82,11 +82,10 @@ func (a *AI302Model) ChatWithMessages(ctx context.Context, modelName string, mesreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, strings.TrimSpace(modelName), messages, false)@@ -134,11 +133,10 @@ func (a *AI302Model) ChatStreamlyWithSender(ctx context.Context, modelName strinreturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), a.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, strings.TrimSpace(modelName), messages, true)@@ -184,11 +182,10 @@ func (a *AI302Model) Embed(ctx context.Context, modelName *string, request Embed}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": model,@@ -272,11 +269,10 @@ func (a *AI302Model) Rerank(ctx context.Context, modelName *string, request Rera}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Rerank)var topN intif rerankConfig != nil && rerankConfig.TopN != 0 {@@ -358,11 +354,10 @@ func (a *AI302Model) TranscribeAudio(ctx context.Context, modelName *string, fil}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -499,11 +494,10 @@ func (a *AI302Model) OCRFile(ctx context.Context, modelName *string, content []b}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.OCR)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.OCR)var docURL stringif urls != nil && strings.TrimSpace(*urls) != "" {@@ -593,11 +587,10 @@ func (a *AI302Model) ParseFile(ctx context.Context, modelName *string, content [return nil, err}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ apiURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.DocumentParse)if err != nil {return nil, err}- apiURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.DocumentParse)reqBody := map[string]interface{}{"url": docURL,@@ -658,11 +651,10 @@ func (a *AI302Model) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Li}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ baseURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -727,11 +719,11 @@ func (a *AI302Model) ShowTask(ctx context.Context, taskID string, apiConfig *API}// URL: https://mineru.net/api/v4/extract/task/{task_id}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ docURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.DocumentParse)if err != nil {return nil, err}- apiURL := fmt.Sprintf("%s/%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.DocumentParse, url.PathEscape(strings.TrimSpace(taskID)))+ apiURL := docURL + "/" + url.PathEscape(strings.TrimSpace(taskID))ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/aliyun.go b/internal/entity/models/aliyun.goindex 7af5f893c2..120662b9d9 100644--- a/internal/entity/models/aliyun.go+++ b/internal/entity/models/aliyun.go@@ -64,11 +64,10 @@ func (a *AliyunModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -111,11 +110,10 @@ func (a *AliyunModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(chatModelConfig, modelName, messages, true)@@ -490,7 +488,7 @@ func (a *AliyunModel) Rerank(ctx context.Context, modelName *string, request Rer}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), a.baseModel.URLSuffix.Rerank)+ url := joinURL(baseURL, a.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 {@@ -613,11 +611,10 @@ func (a *AliyunModel) AudioSpeech(ctx context.Context, modelName *string, audioCreturn nil, fmt.Errorf("aliyun TTS URL suffix is required")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), strings.TrimPrefix(a.baseModel.URLSuffix.TTS, "/"))input := aliyunTTSInput{Text: *audioContent, Voice: aliyunTTSDefaultVoice}if ttsConfig != nil {@@ -763,7 +760,7 @@ func (a *AliyunModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]L}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), a.baseModel.URLSuffix.Models)+ url := joinURL(baseURL, a.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}diff --git a/internal/entity/models/anthropic.go b/internal/entity/models/anthropic.goindex 225a36a5bc..d823e3a932 100644--- a/internal/entity/models/anthropic.go+++ b/internal/entity/models/anthropic.go@@ -83,12 +83,10 @@ func (a *AnthropicModel) ChatWithMessages(ctx context.Context, modelName string,baseURLConfig := &APIConfig{Region: &baseURLRegion}baseURLConfig.BaseURL = apiConfig.BaseURL- baseURL, err := a.baseModel.GetBaseURL(baseURLConfig)+ url, err := a.baseModel.EndpointURL(baseURLConfig, a.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSpace(strings.TrimSuffix(baseURL, "/"))- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(a.baseModel.URLSuffix.Chat, "/"))reqBody := map[string]interface{}{"model": modelName,@@ -397,12 +395,10 @@ func (a *AnthropicModel) ListModels(ctx context.Context, apiConfig *APIConfig) (baseURLConfig := &APIConfig{Region: &baseURLRegion}baseURLConfig.BaseURL = apiConfig.BaseURL- baseURL, err := a.baseModel.GetBaseURL(baseURLConfig)+ url, err := a.baseModel.EndpointURL(baseURLConfig, a.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSpace(strings.TrimSuffix(baseURL, "/"))- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(a.baseModel.URLSuffix.Models, "/"))ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -469,12 +465,10 @@ func (a *AnthropicModel) ChatStreamlyWithSender(ctx context.Context, modelName sbaseURLConfig := &APIConfig{Region: &baseURLRegion}baseURLConfig.BaseURL = apiConfig.BaseURL- baseURL, err := a.baseModel.GetBaseURL(baseURLConfig)+ url, err := a.baseModel.EndpointURL(baseURLConfig, a.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSpace(strings.TrimSuffix(baseURL, "/"))- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(a.baseModel.URLSuffix.Chat, "/"))reqBody := map[string]interface{}{"model": modelName,diff --git a/internal/entity/models/astraflow.go b/internal/entity/models/astraflow.goindex d50c6e4468..6bed002eb7 100644--- a/internal/entity/models/astraflow.go+++ b/internal/entity/models/astraflow.go@@ -24,7 +24,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// AstraflowModel implements ModelDriver for Astraflow (UCloud@@ -76,12 +75,10 @@ func (a *AstraflowModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- baseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, a.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -112,12 +109,10 @@ func (a *AstraflowModel) ChatStreamlyWithSender(ctx context.Context, modelName sreturn err}- baseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, a.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{@@ -134,12 +129,10 @@ func (a *AstraflowModel) ListModels(ctx context.Context, apiConfig *APIConfig) (return nil, err}- baseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, a.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -190,11 +183,10 @@ func (a *AstraflowModel) Embed(ctx context.Context, modelName *string, request Ereturn []EmbeddingData{}, nil}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -269,11 +261,10 @@ func (a *AstraflowModel) Rerank(ctx context.Context, modelName *string, requestreturn &RerankResponse{}, nil}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.Rerank)var topN = rerankConfig.TopNif rerankConfig.TopN != 0 {@@ -359,11 +350,10 @@ func (a *AstraflowModel) AudioSpeech(ctx context.Context, modelName *string, audreturn nil, fmt.Errorf("text content is missing")}- resolvedBaseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, a.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/avian.go b/internal/entity/models/avian.goindex d1f8f03b8c..24a70a96bb 100644--- a/internal/entity/models/avian.go+++ b/internal/entity/models/avian.go@@ -57,7 +57,7 @@ func (a *AvianModel) chatURL(apiConfig *APIConfig) (string, error) {if err != nil {return "", err}- return fmt.Sprintf("%s/%s", baseURL, a.baseModel.URLSuffix.Chat), nil+ return joinURL(baseURL, a.baseModel.URLSuffix.Chat), nil}func (a *AvianModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {@@ -139,12 +139,10 @@ func (a *AvianModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lireturn nil, err}- baseURL, err := a.baseModel.GetBaseURL(apiConfig)+ url, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, a.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/azure_openai.go b/internal/entity/models/azure_openai.goindex c2d4d5658f..3eb490f12e 100644--- a/internal/entity/models/azure_openai.go+++ b/internal/entity/models/azure_openai.go@@ -234,13 +234,11 @@ func (a *AzureOpenAIModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- baseURL, err := a.baseModel.GetBaseURL(apiConfig)+ modelsURL, err := a.baseModel.EndpointURL(apiConfig, a.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s?api-version=%s",- strings.TrimRight(baseURL, "/"), a.baseModel.URLSuffix.Models, azureAPIVersion)+ url := fmt.Sprintf("%s?api-version=%s", modelsURL, azureAPIVersion)body, err := a.baseModel.doGetRequest(ctx, url, apiConfig, nonStreamCallTimeout)if err != nil {diff --git a/internal/entity/models/baichuan.go b/internal/entity/models/baichuan.goindex 82675253e8..a0742282a6 100644--- a/internal/entity/models/baichuan.go+++ b/internal/entity/models/baichuan.go@@ -57,11 +57,10 @@ func (b *BaichuanModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := b.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -81,11 +80,10 @@ func (b *BaichuanModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true}@@ -104,11 +102,10 @@ func (b *BaichuanModel) Embed(ctx context.Context, modelName *string, request Emreturn []EmbeddingData{}, nil}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/baidu.go b/internal/entity/models/baidu.goindex 556766c1e2..071286344e 100644--- a/internal/entity/models/baidu.go+++ b/internal/entity/models/baidu.go@@ -58,11 +58,10 @@ func (b *BaiduModel) ChatWithMessages(ctx context.Context, modelName string, mesreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -128,11 +127,10 @@ func (b *BaiduModel) ChatStreamlyWithSender(ctx context.Context, modelName strinreturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), b.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -216,11 +214,10 @@ func (b *BaiduModel) Embed(ctx context.Context, modelName *string, request Embedreturn []EmbeddingData{}, nil}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -312,11 +309,10 @@ func (b *BaiduModel) Rerank(ctx context.Context, modelName *string, request Rerareturn &RerankResponse{}, nil}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), b.baseModel.URLSuffix.Rerank)var topN = rerankConfig.TopNif rerankConfig.TopN == 0 {@@ -426,11 +422,10 @@ func (b *BaiduModel) OCRFile(ctx context.Context, modelName *string, content []breturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.OCR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.OCR)reqData := map[string]interface{}{"model": *modelName,@@ -509,11 +504,10 @@ func (b *BaiduModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lireturn nil, err}- resolvedBaseURL, err := b.baseModel.GetBaseURL(apiConfig)+ url, err := b.baseModel.EndpointURL(apiConfig, b.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, b.baseModel.URLSuffix.Models)reqBody := map[string]string{}diff --git a/internal/entity/models/base_model.go b/internal/entity/models/base_model.goindex 5a648d1ffe..79e8e1f772 100644--- a/internal/entity/models/base_model.go+++ b/internal/entity/models/base_model.go@@ -344,6 +344,64 @@ func (b *BaseModel) GetBaseURL(apiConfig *APIConfig) (string, error) {return baseURL, nil}+// EndpointURL resolves the request URL for an API path suffix, joining it onto+// the base URL configured for this request. Drivers use it instead of+// fmt.Sprintf("%s/%s", baseURL, suffix) so a version segment pasted into the+// user-supplied base URL is not duplicated onto the suffix.+func (b *BaseModel) EndpointURL(apiConfig *APIConfig, suffix string) (string, error) {+ baseURL, err := b.GetBaseURL(apiConfig)+ if err != nil {+ return "", err+ }+ return joinURL(baseURL, suffix), nil+}++// joinURL concatenates a resolved base URL with an API path suffix.+// Some providers keep the API version in url_suffix (MiniMax's+// "v1/text/chatcompletion_v2", Anthropic's "v1/messages", Xinference's+// "v1/chat/completions") and expect a versionless base URL, while+// OpenAI-compatible ones expect "/v1" to sit in the base URL. Users paste+// whichever habit they learned, so drop the duplicated segment rather than+// emitting "/v1/v1/text/chatcompletion_v2", which the provider answers 404.+func joinURL(baseURL, suffix string) string {+ base := strings.TrimRight(strings.TrimSpace(baseURL), "/")+ path := strings.TrimLeft(strings.TrimSpace(suffix), "/")+ if base == "" {+ return path+ }+ if path == "" {+ return base+ }+ if idx := strings.LastIndex(base, "/"); idx >= 0 {+ if version := apiVersionSegment(base[idx+1:]); version != "" && version == firstPathSegment(path) {+ base = base[:idx]+ }+ }+ return base + "/" + path+}++// apiVersionSegment reports whether the path segment is an API version marker+// such as "v1" or "v2". Only version segments are deduplicated — they are what+// users habitually paste into the base URL.+func apiVersionSegment(segment string) string {+ if len(segment) < 2 || (segment[0] != 'v' && segment[0] != 'V') {+ return ""+ }+ for _, c := range []byte(segment[1:]) {+ if c < '0' || c > '9' {+ return ""+ }+ }+ return segment+}++func firstPathSegment(path string) string {+ if idx := strings.Index(path, "/"); idx >= 0 {+ return path[:idx]+ }+ return path+}+// ParseSSEStream reads the body of an OpenAI-compatible Server-Sent Events// response and calls onEvent for each successfully-parsed JSON payload.// A malformed JSON payload after "data:" returns an error wrapped asdiff --git a/internal/entity/models/base_model_test.go b/internal/entity/models/base_model_test.goindex a3d4913520..45f04a2a5c 100644--- a/internal/entity/models/base_model_test.go+++ b/internal/entity/models/base_model_test.go@@ -21,6 +21,60 @@ import ("testing")+// joinURL keeps a single API version segment when the base URL the user pasted+// already carries the one the provider's url_suffix adds. MiniMax is the+// motivating case: suffix "v1/text/chatcompletion_v2" over a base URL that+// OpenAI-compatible habits make people fill in as "https://api.minimaxi.com/v1"+// would otherwise request /v1/v1/text/chatcompletion_v2.+func TestJoinURL(t *testing.T) {+ cases := []struct {+ name string+ base string+ suffix string+ want string+ comment string+ }{+ {"versionless base", "https://api.minimaxi.com", "v1/text/chatcompletion_v2", "https://api.minimaxi.com/v1/text/chatcompletion_v2", "conf default: base has no version"},+ {"base carries v1", "https://api.minimaxi.com/v1", "v1/text/chatcompletion_v2", "https://api.minimaxi.com/v1/text/chatcompletion_v2", "the bug: base duplicated the suffix's version"},+ {"trailing slashes", "https://api.minimaxi.com/v1/", "v1/text/chatcompletion_v2", "https://api.minimaxi.com/v1/text/chatcompletion_v2", ""},+ {"leading slash on suffix", "https://api.minimaxi.com/v1", "/v1/text/chatcompletion_v2", "https://api.minimaxi.com/v1/text/chatcompletion_v2", ""},+ {"whitespace", " https://api.minimaxi.com/v1/ ", " v1/text/chatcompletion_v2 ", "https://api.minimaxi.com/v1/text/chatcompletion_v2", ""},+ {"different versions kept", "https://host/v1", "v2/chat", "https://host/v1/v2/chat", "only an identical version segment is dropped"},+ {"openai style untouched", "https://api.openai.com/v1", "chat/completions", "https://api.openai.com/v1/chat/completions", "suffix without a version must not lose the base's /v1"},+ {"non version segment kept", "https://host/api", "api/x", "https://host/api/api/x", "only version segments are deduplicated"},+ {"version-like host kept", "http://v1:8080", "v1/chat", "http://v1:8080/v1/chat", "host name is not a path segment"},+ {"empty base", "", "v1/models", "v1/models", ""},+ {"empty suffix", "https://api.minimaxi.com/v1", "", "https://api.minimaxi.com/v1", ""},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ if got := joinURL(tc.base, tc.suffix); got != tc.want {+ t.Errorf("joinURL(%q, %q)=%q, want %q %s", tc.base, tc.suffix, got, tc.want, tc.comment)+ }+ })+ }+}++func TestBaseModelEndpointURLUsesConfiguredBase(t *testing.T) {+ base := BaseModel{BaseURL: map[string]string{"default": "https://api.minimaxi.com"}}+ defaultURL, err := base.EndpointURL(nil, "v1/text/chatcompletion_v2")+ if err != nil {+ t.Fatalf("EndpointURL: %v", err)+ }+ if defaultURL != "https://api.minimaxi.com/v1/text/chatcompletion_v2" {+ t.Errorf("EndpointURL(nil)=%q, want conf base joined with suffix", defaultURL)+ }++ apiKey := "key"+ userURL, err := base.EndpointURL(&APIConfig{BaseURL: ptr("https://api.minimax.io/v1"), ApiKey: &apiKey}, "v1/text/chatcompletion_v2")+ if err != nil {+ t.Fatalf("EndpointURL: %v", err)+ }+ if userURL != "https://api.minimax.io/v1/text/chatcompletion_v2" {+ t.Errorf("EndpointURL(user base)=%q, want the user base without a duplicated version", userURL)+ }+}+// ParseListModel feeds the provider-model list endpoint whose merge treats// remote entries as authoritative: every returned entry must carry non-empty// model types. Catalog hits are normalized; catalog misses fall back todiff --git a/internal/entity/models/cohere.go b/internal/entity/models/cohere.goindex b5d47adceb..3290cd92d8 100644--- a/internal/entity/models/cohere.go+++ b/internal/entity/models/cohere.go@@ -141,11 +141,10 @@ func (c *CoHereModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -238,11 +237,10 @@ func (c *CoHereModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -366,13 +364,10 @@ func (c *CoHereModel) Embed(ctx context.Context, modelName *string, request Embereturn []EmbeddingData{}, nil}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL := strings.TrimSuffix(resolvedBaseURL, "/")- suffix := strings.TrimPrefix(c.baseModel.URLSuffix.Embedding, "/")- url := fmt.Sprintf("%s/%s", baseURL, suffix)inputType := "search_document"if request.Query {@@ -464,13 +459,10 @@ func (c *CoHereModel) Rerank(ctx context.Context, modelName *string, request Rerreturn &RerankResponse{}, nil}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- baseURL := strings.TrimSuffix(resolvedBaseURL, "/")- suffix := strings.TrimPrefix(c.baseModel.URLSuffix.Rerank, "/")- url := fmt.Sprintf("%s/%s", baseURL, suffix)var topN = rerankConfig.TopNif rerankConfig.TopN == 0 {@@ -557,11 +549,10 @@ func (c *CoHereModel) TranscribeAudio(ctx context.Context, modelName *string, fireturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.ASR)// multipart body@@ -691,11 +682,10 @@ func (c *CoHereModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ url, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/cometapi.go b/internal/entity/models/cometapi.goindex e6fc94c587..c002b1489c 100644--- a/internal/entity/models/cometapi.go+++ b/internal/entity/models/cometapi.go@@ -75,8 +75,7 @@ func (c *CometAPIModel) endpointURL(region, suffix string) (string, error) {if err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(suffix, "/")), nil+ return joinURL(baseURL, suffix), nil}func (c *CometAPIModel) balanceURL(apiKey string) string {@@ -358,11 +357,10 @@ func (c *CometAPIModel) TranscribeAudio(ctx context.Context, modelName *string,return nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ baseURL, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -478,11 +476,10 @@ func (c *CometAPIModel) AudioSpeech(ctx context.Context, modelName *string, audireturn nil, fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := c.baseModel.GetBaseURL(apiConfig)+ baseURL, err := c.baseModel.EndpointURL(apiConfig, c.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, c.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/deepinfra.go b/internal/entity/models/deepinfra.goindex fd24a29345..078dbec7f2 100644--- a/internal/entity/models/deepinfra.go+++ b/internal/entity/models/deepinfra.go@@ -64,11 +64,10 @@ func (d *DeepInfraModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -105,11 +104,10 @@ func (d *DeepInfraModel) ChatStreamlyWithSender(ctx context.Context, modelName sreturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)if modelConfig != nil {@@ -144,11 +142,10 @@ func (d *DeepInfraModel) Embed(ctx context.Context, modelName *string, request Ereturn []EmbeddingData{}, fmt.Errorf("texts is empty")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -231,14 +228,12 @@ func (d *DeepInfraModel) Rerank(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ // Reranker model ids may contain slashes (e.g. Qwen/Qwen3-Reranker-4B).+ rerankURL, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- baseURL := resolvedBaseURL-- // Reranker model ids may contain slashes (e.g. Qwen/Qwen3-Reranker-4B).- url := fmt.Sprintf("%s/%s/%s", strings.TrimSuffix(baseURL, "/"), d.baseModel.URLSuffix.Rerank, *modelName)+ url := rerankURL + "/" + *modelNamereqBody := map[string]interface{}{"query": query,@@ -321,11 +316,10 @@ func (d *DeepInfraModel) TranscribeAudio(ctx context.Context, modelName *string,return nil, fmt.Errorf("model name is missing")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.ASR)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -462,11 +456,11 @@ func (d *DeepInfraModel) AudioSpeech(ctx context.Context, modelName *string, aud}// URL: https://api.deepinfra.com/v1/text-to-speech/{voice_id}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ ttsURL, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.TTS, voiceID)+ url := ttsURL + "/" + voiceIDif ttsConfig != nil && ttsConfig.Format != "" {reqBody["output_format"] = ttsConfig.Format@@ -540,11 +534,11 @@ func (d *DeepInfraModel) AudioSpeechWithSender(ctx context.Context, modelName *s}// URL: https://api.deepinfra.com/v1/text-to-speech/{voice_id}/stream- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ ttsURL, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.TTS)if err != nil {return err}- url := fmt.Sprintf("%s/%s/%s/stream", resolvedBaseURL, d.baseModel.URLSuffix.TTS, voiceID)+ url := ttsURL + "/" + voiceID + "/stream"if ttsConfig != nil && ttsConfig.Format != "" {reqBody["output_format"] = ttsConfig.Format@@ -614,11 +608,10 @@ func (d *DeepInfraModel) ParseFile(ctx context.Context, modelName *string, contefunc (d *DeepInfraModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Models)reqBody := map[string]interface{}{}@@ -678,11 +671,10 @@ func (d *DeepInfraModel) Balance(ctx context.Context, apiConfig *APIConfig) (mapreturn nil, err}- baseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, d.baseModel.URLSuffix.Balance)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/deepseek.go b/internal/entity/models/deepseek.goindex a642f0b1a8..e6934355d1 100644--- a/internal/entity/models/deepseek.go+++ b/internal/entity/models/deepseek.go@@ -25,7 +25,6 @@ import ("net/http""ragflow/internal/common""strconv"- "strings")// DeepSeekModel implements ModelDriver for DeepSeek@@ -94,11 +93,10 @@ func (d *DeepSeekModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil && chatModelConfig.Thinking != nil && *chatModelConfig.Thinking {@@ -151,11 +149,10 @@ func (d *DeepSeekModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)if chatModelConfig != nil && chatModelConfig.Thinking != nil && *chatModelConfig.Thinking {@@ -211,11 +208,10 @@ func (d *DeepSeekModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([return nil, err}- resolvedBaseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, d.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}@@ -282,13 +278,11 @@ func (d *DeepSeekModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[return nil, err}- baseURL, err := d.baseModel.GetBaseURL(apiConfig)+ url, err := d.baseModel.EndpointURL(apiConfig, d.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), d.baseModel.URLSuffix.Balance)-ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/fishaudio.go b/internal/entity/models/fishaudio.goindex de198093e2..18f774de40 100644--- a/internal/entity/models/fishaudio.go+++ b/internal/entity/models/fishaudio.go@@ -80,11 +80,10 @@ func (f *FishAudioModel) TranscribeAudio(ctx context.Context, modelName *string,return nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.ASR)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -191,11 +190,10 @@ func (f *FishAudioModel) AudioSpeech(ctx context.Context, modelName *string, audreturn nil, fmt.Errorf("text content is missing")}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"text": *audioContent,@@ -254,11 +252,11 @@ func (f *FishAudioModel) AudioSpeechWithSender(ctx context.Context, modelName *sreturn fmt.Errorf("text content is missing")}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ ttsURL, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.TTS)if err != nil {return err}- url := fmt.Sprintf("%s/%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.TTS, "stream/with-timestamp")+ url := ttsURL + "/stream/with-timestamp"reqBody := map[string]interface{}{"text": *audioContent,@@ -340,11 +338,10 @@ func (f *FishAudioModel) ListModels(ctx context.Context, apiConfig *APIConfig) (return nil, err}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/funasr.go b/internal/entity/models/funasr.goindex 63b4568043..7cec0feaa7 100644--- a/internal/entity/models/funasr.go+++ b/internal/entity/models/funasr.go@@ -83,11 +83,10 @@ func (f *FunASR) TranscribeAudio(ctx context.Context, modelName *string, file *s}model := strings.TrimSpace(*modelName)- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -217,11 +216,10 @@ func (f *FunASR) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListMoif err := f.baseModel.APIConfigCheck(apiConfig); err != nil {return nil, err}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/futurmix.go b/internal/entity/models/futurmix.goindex 691f0e7be8..678d65ab96 100644--- a/internal/entity/models/futurmix.go+++ b/internal/entity/models/futurmix.go@@ -21,7 +21,6 @@ import ("fmt""io""ragflow/internal/common"- "strings")// FuturMixModel implements ModelDriver for FuturMix@@ -53,8 +52,7 @@ func (f *FuturMixModel) endpointURL(region, suffix string) (string, error) {if err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(suffix, "/")), nil+ return joinURL(baseURL, suffix), nil}// ChatWithMessages sends a non-streaming chat completion@@ -67,11 +65,10 @@ func (f *FuturMixModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil && chatModelConfig.Thinking != nil {@@ -104,11 +101,10 @@ func (f *FuturMixModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := f.baseModel.GetBaseURL(apiConfig)+ url, err := f.baseModel.EndpointURL(apiConfig, f.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, f.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{diff --git a/internal/entity/models/gitee.go b/internal/entity/models/gitee.goindex 5a900bc28c..15cfa6ac8c 100644--- a/internal/entity/models/gitee.go+++ b/internal/entity/models/gitee.go@@ -63,11 +63,10 @@ func (g *GiteeModel) ChatWithMessages(ctx context.Context, modelName string, mesreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -106,11 +105,10 @@ func (g *GiteeModel) ChatStreamlyWithSender(ctx context.Context, modelName strinchatModelConfig.UsageResult = nil}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), g.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -171,7 +169,7 @@ func (g *GiteeModel) Embed(ctx context.Context, modelName *string, request Embed}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), g.baseModel.URLSuffix.Embedding)+ url := joinURL(baseURL, g.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -280,7 +278,7 @@ func (g *GiteeModel) Rerank(ctx context.Context, modelName *string, request Rera}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), g.baseModel.URLSuffix.Rerank)+ url := joinURL(baseURL, g.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 {@@ -390,7 +388,7 @@ func (g *GiteeModel) OCRFile(ctx context.Context, modelName *string, content []b}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), g.baseModel.URLSuffix.OCR)+ url := joinURL(baseURL, g.baseModel.URLSuffix.OCR)payload := &bytes.Buffer{}writer := multipart.NewWriter(payload)@@ -487,7 +485,7 @@ func (g *GiteeModel) ParseFile(ctx context.Context, modelName *string, content [}baseURL := resolvedBaseURL- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), g.baseModel.URLSuffix.DocumentParse)+ url := joinURL(baseURL, g.baseModel.URLSuffix.DocumentParse)payload := &bytes.Buffer{}writer := multipart.NewWriter(payload)@@ -616,11 +614,10 @@ func (g *GiteeModel) getParseFile(ctx context.Context, baseURL *string, apiKey,func (g *GiteeModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}@@ -668,13 +665,11 @@ func (g *GiteeModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[strif err := g.baseModel.APIConfigCheck(apiConfig); err != nil {return nil, err}- baseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, g.baseModel.URLSuffix.Balance)-// Build request bodyreqBody := map[string]interface{}{}@@ -730,11 +725,10 @@ func (g *GiteeModel) CheckConnection(ctx context.Context, apiConfig *APIConfig)return err}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Status)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.Status)// Build request bodyreqBody := map[string]interface{}{}@@ -808,11 +802,10 @@ func (g *GiteeModel) ListTasks(ctx context.Context, apiConfig *APIConfig) ([]Lisreturn nil, err}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Tasks)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.Tasks)// Build request bodyreqBody := map[string]interface{}{}@@ -869,11 +862,11 @@ func (g *GiteeModel) ShowTask(ctx context.Context, taskID string, apiConfig *APIreturn nil, err}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ taskURL, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Task)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s/%s/get", resolvedBaseURL, g.baseModel.URLSuffix.Task, taskID)+ url := taskURL + "/" + taskID + "/get"// Build request bodyreqBody := map[string]interface{}{}diff --git a/internal/entity/models/gpustack.go b/internal/entity/models/gpustack.goindex 62e7c9c8f3..c417aacc2d 100644--- a/internal/entity/models/gpustack.go+++ b/internal/entity/models/gpustack.go@@ -63,12 +63,10 @@ func (g *GPUStackModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- baseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, g.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := g.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -98,12 +96,10 @@ func (g *GPUStackModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn err}- baseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, g.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -125,12 +121,10 @@ func (g *GPUStackModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([return nil, err}- baseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, g.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -210,7 +204,7 @@ func (g *GPUStackModel) Embed(if g.baseModel.URLSuffix.Embedding == "" {return nil, fmt.Errorf("gpustack: embedding URL suffix is not configured")}- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(g.baseModel.URLSuffix.Embedding, "/"))+ url := joinURL(baseURL, g.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/greenpt.go b/internal/entity/models/greenpt.goindex 4f570b5dd1..bd974f979f 100644--- a/internal/entity/models/greenpt.go+++ b/internal/entity/models/greenpt.go@@ -77,11 +77,10 @@ func (m *GreenPTModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ baseURL, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -120,11 +119,10 @@ func (m *GreenPTModel) ChatStreamlyWithSender(ctx context.Context, modelName strchatModelConfig.UsageResult = nil}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ baseURL, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(chatModelConfig, modelName, messages, true)@@ -170,11 +168,10 @@ func (m *GreenPTModel) TranscribeAudio(ctx context.Context, modelName *string, f}defer audio.Close()- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ endpoint, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- endpoint := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(m.baseModel.URLSuffix.ASR, "/"))query := url.Values{"model": {*modelName}}if asrConfig != nil {for key, value := range asrConfig.Params {diff --git a/internal/entity/models/groq.go b/internal/entity/models/groq.goindex ac0db3ca47..1bac1c7dee 100644--- a/internal/entity/models/groq.go+++ b/internal/entity/models/groq.go@@ -59,8 +59,7 @@ func (g *GroqModel) endpoint(apiConfig *APIConfig, suffix string) (string, errorif err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(suffix, "/")), nil+ return joinURL(baseURL, suffix), nil}func applyGroqReasoningRequestParams(reqBody map[string]any, modelName string, chatModelConfig *ChatConfig) {@@ -242,11 +241,10 @@ func (g *GroqModel) TranscribeAudio(ctx context.Context, modelName *string, filereturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -363,11 +361,10 @@ func (g *GroqModel) AudioSpeech(ctx context.Context, modelName *string, audioConreturn nil, fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := g.baseModel.GetBaseURL(apiConfig)+ url, err := g.baseModel.EndpointURL(apiConfig, g.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, g.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/huaweicloud.go b/internal/entity/models/huaweicloud.goindex 3d663110b4..35ba1d96c5 100644--- a/internal/entity/models/huaweicloud.go+++ b/internal/entity/models/huaweicloud.go@@ -280,7 +280,7 @@ func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, requestreturn nil, err}baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(h.baseModel.URLSuffix.Embedding, "/"))+ url := joinURL(baseURL, h.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -388,7 +388,7 @@ func (h *HuaweiCloudModel) Rerank(ctx context.Context, modelName *string, requesreturn nil, err}baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(h.baseModel.URLSuffix.Rerank, "/"))+ url := joinURL(baseURL, h.baseModel.URLSuffix.Rerank)reqBody := map[string]interface{}{"model": *modelName,@@ -494,7 +494,7 @@ func (h *HuaweiCloudModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(h.baseModel.URLSuffix.Models, "/"))+ url := joinURL(baseURL, h.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/huggingface.go b/internal/entity/models/huggingface.goindex aff9704f75..69f2915137 100644--- a/internal/entity/models/huggingface.go+++ b/internal/entity/models/huggingface.go@@ -58,11 +58,10 @@ func (h *HuggingFaceModel) ChatWithMessages(ctx context.Context, modelName strinreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, h.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -96,11 +95,10 @@ func (h *HuggingFaceModel) ChatStreamlyWithSender(ctx context.Context, modelNamereturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, h.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)if modelConfig != nil && modelConfig.Thinking != nil {@@ -144,11 +142,11 @@ func (h *HuggingFaceModel) Embed(ctx context.Context, modelName *string, requestreturn nil, err}- resolvedBaseURL, err := h.baseModel.GetBaseURL(apiConfig)+ embedURL, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s/%s", resolvedBaseURL, h.baseModel.URLSuffix.Embedding, *modelName)+ url := embedURL + "/" + *modelNamectx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -229,11 +227,10 @@ func (h *HuggingFaceModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- resolvedBaseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, h.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}diff --git a/internal/entity/models/hunyuan.go b/internal/entity/models/hunyuan.goindex 9cf3ad913f..759932f526 100644--- a/internal/entity/models/hunyuan.go+++ b/internal/entity/models/hunyuan.go@@ -24,7 +24,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// HunyuanModel implements ModelDriver for Tencent Hunyuan@@ -76,12 +75,10 @@ func (h *HunyuanModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, h.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := h.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -112,12 +109,10 @@ func (h *HunyuanModel) ChatStreamlyWithSender(ctx context.Context, modelName strchatModelConfig.UsageResult = nil}- baseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, h.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -131,12 +126,10 @@ func (h *HunyuanModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, h.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -190,12 +183,10 @@ func (h *HunyuanModel) Embed(ctx context.Context, modelName *string, request Embreturn nil, fmt.Errorf("model name is required")}- baseURL, err := h.baseModel.GetBaseURL(apiConfig)+ url, err := h.baseModel.EndpointURL(apiConfig, h.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, h.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/jiekouai.go b/internal/entity/models/jiekouai.goindex e1c7484e3b..3919f7f533 100644--- a/internal/entity/models/jiekouai.go+++ b/internal/entity/models/jiekouai.go@@ -102,11 +102,10 @@ func (j *JieKouAIModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, j.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -144,11 +143,10 @@ func (j *JieKouAIModel) ChatStreamlyWithSender(ctx context.Context, modelName stmodelConfig.UsageResult = nil}- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), j.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -179,11 +177,10 @@ func (j *JieKouAIModel) Embed(ctx context.Context, modelName *string, request Em}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), j.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": model,@@ -265,11 +262,10 @@ func (j *JieKouAIModel) Rerank(ctx context.Context, modelName *string, request R}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), j.baseModel.URLSuffix.Rerank)reqBody := map[string]interface{}{"model": model,@@ -364,11 +360,10 @@ func (j *JieKouAIModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, j.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/jina.go b/internal/entity/models/jina.goindex 530de837f7..6c429cd81b 100644--- a/internal/entity/models/jina.go+++ b/internal/entity/models/jina.go@@ -109,7 +109,7 @@ func (j *JinaModel) ChatWithMessages(ctx context.Context, modelName string, mess}baseURL = strings.TrimSuffix(baseURL, "/")messages = prepareJinaMessages(baseURL, messages)- url := fmt.Sprintf("%s/%s", baseURL, j.baseModel.URLSuffix.Chat)+ url := joinURL(baseURL, j.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -150,7 +150,7 @@ func (j *JinaModel) ChatStreamlyWithSender(ctx context.Context, modelName string}baseURL = strings.TrimSuffix(baseURL, "/")messages = prepareJinaMessages(baseURL, messages)- url := fmt.Sprintf("%s/%s", baseURL, j.baseModel.URLSuffix.Chat)+ url := joinURL(baseURL, j.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)@@ -437,11 +437,10 @@ func (j *JinaModel) Embed(ctx context.Context, modelName *string, request EmbedRreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, j.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -549,11 +548,10 @@ func (j *JinaModel) Rerank(ctx context.Context, modelName *string, request Reranreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, j.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 && rerankConfig.TopN < topN {@@ -622,11 +620,10 @@ func (j *JinaModel) Rerank(ctx context.Context, modelName *string, request Reranfunc (j *JinaModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {- resolvedBaseURL, err := j.baseModel.GetBaseURL(apiConfig)+ url, err := j.baseModel.EndpointURL(apiConfig, j.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, j.baseModel.URLSuffix.Models)req, err := http.NewRequest("GET", url, nil)if err != nil {diff --git a/internal/entity/models/lmstudio.go b/internal/entity/models/lmstudio.goindex b2780e1312..1a1f5bc157 100644--- a/internal/entity/models/lmstudio.go+++ b/internal/entity/models/lmstudio.go@@ -65,12 +65,12 @@ func (l *LmStudioModel) ChatWithMessages(ctx context.Context, modelName string,if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, l.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, l.baseModel.URLSuffix.Chat)// For qwen/glm models, use async chat endpointmodelType := strings.Split(modelName, "-")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, l.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, l.baseModel.URLSuffix.AsyncChat)}// Build request body@@ -112,10 +112,10 @@ func (l *LmStudioModel) ChatStreamlyWithSender(ctx context.Context, modelName stif err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, l.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, l.baseModel.URLSuffix.Chat)modelType := strings.Split(modelName, "-")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, l.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, l.baseModel.URLSuffix.AsyncChat)}// Build request body with streaming enabled@@ -164,7 +164,7 @@ func (l *LmStudioModel) Embed(ctx context.Context, modelName *string, request Emreturn nil, fmt.Errorf("missing base URL: please configure the local access address for LM Studio (e.g., http://127.0.0.1:1234/v1)")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Embedding)+ url := joinURL(baseURL, l.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -273,7 +273,7 @@ func (l *LmStudioModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([return nil, fmt.Errorf("missing base URL: please configure the local access address for LM Studio (e.g., http://127.0.0.1:1234/v1)")}- url := fmt.Sprintf("%s/%s", baseURL, l.baseModel.URLSuffix.Models)+ url := joinURL(baseURL, l.baseModel.URLSuffix.Models)reqBody := map[string]interface{}{}diff --git a/internal/entity/models/localai.go b/internal/entity/models/localai.goindex dcdead9775..57b9ee7604 100644--- a/internal/entity/models/localai.go+++ b/internal/entity/models/localai.go@@ -24,7 +24,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// LocalAIModel implements ModelDriver for LocalAI@@ -73,11 +72,10 @@ func (l *LocalAIModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -108,11 +106,10 @@ func (l *LocalAIModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("messages is empty")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)if chatModelConfig != nil {@@ -152,11 +149,10 @@ func (l *LocalAIModel) Embed(ctx context.Context, modelName *string, request Embreturn nil, fmt.Errorf("model name is required")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -255,11 +251,10 @@ func (l *LocalAIModel) Rerank(ctx context.Context, modelName *string, request Rereturn nil, fmt.Errorf("model name is required")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 {@@ -330,11 +325,10 @@ func (l *LocalAIModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), l.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/longcat.go b/internal/entity/models/longcat.goindex a5416d3c0f..d6ab3d8b9a 100644--- a/internal/entity/models/longcat.go+++ b/internal/entity/models/longcat.go@@ -23,7 +23,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// LongCatModel implements ModelDriver for LongCat (Meituan).@@ -87,12 +86,10 @@ func (l *LongCatModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, l.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)delete(reqBody, "stop")@@ -119,12 +116,10 @@ func (l *LongCatModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("messages is empty")}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, l.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)delete(reqBody, "stop")reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -158,12 +153,10 @@ func (l *LongCatModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := l.baseModel.GetBaseURL(apiConfig)+ url, err := l.baseModel.EndpointURL(apiConfig, l.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, l.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/mineru_local.go b/internal/entity/models/mineru_local.goindex 73e25b3602..91389b4ea7 100644--- a/internal/entity/models/mineru_local.go+++ b/internal/entity/models/mineru_local.go@@ -177,7 +177,7 @@ func (m *MinerULocalModel) ParseFile(ctx context.Context, modelName *string, conif err != nil {return nil, err}- apiURL := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.DocumentParse)+ apiURL := joinURL(resolvedBaseURL, m.baseModel.URLSuffix.DocumentParse)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -286,11 +286,11 @@ func (m *MinerULocalModel) ShowTask(ctx context.Context, taskID string, apiConfireturn nil, fmt.Errorf("taskID is empty")}- resolvedBaseURL, err := m.GetBaseURL(apiConfig)+ taskURL, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Task)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s/%s/result", resolvedBaseURL, m.baseModel.URLSuffix.Task, taskID)+ url := taskURL + "/" + taskID + "/result"ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/minimax.go b/internal/entity/models/minimax.goindex 2eb9a81e66..5dc346dc3c 100644--- a/internal/entity/models/minimax.go+++ b/internal/entity/models/minimax.go@@ -117,11 +117,10 @@ func (m *MinimaxModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -177,11 +176,10 @@ func (m *MinimaxModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("sender is required")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -269,11 +267,10 @@ func (m *MinimaxModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -348,11 +345,10 @@ func (m *MinimaxModel) AudioSpeech(ctx context.Context, modelName *string, audioreturn nil, fmt.Errorf("text content is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": modelName,@@ -438,19 +434,14 @@ func (m *MinimaxModel) AudioSpeechWithSender(ctx context.Context, modelName *strreturn fmt.Errorf("text content is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ ttsSuffix := m.baseModel.URLSuffix.TTS+ if ttsSuffix == "" {+ ttsSuffix = "v1/t2a_v2"+ }+ url, err := m.baseModel.EndpointURL(apiConfig, ttsSuffix)if err != nil {return err}- baseURL := strings.TrimSuffix(resolvedBaseURL, "/")- if baseURL == "" {- baseURL = strings.TrimSuffix(resolvedBaseURL, "/")- }- suffix := strings.TrimPrefix(m.baseModel.URLSuffix.TTS, "/")- if suffix == "" {- suffix = "v1/t2a_v2"- }- url := fmt.Sprintf("%s/%s", baseURL, suffix)reqBody := map[string]interface{}{"model": modelName,diff --git a/internal/entity/models/mistral.go b/internal/entity/models/mistral.goindex 7a9256911c..2ba907c62e 100644--- a/internal/entity/models/mistral.go+++ b/internal/entity/models/mistral.go@@ -137,11 +137,10 @@ func (m *MistralModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := m.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -173,11 +172,10 @@ func (m *MistralModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn err}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true,@@ -224,12 +222,10 @@ func (m *MistralModel) Embed(ctx context.Context, modelName *string, request Embreturn nil, fmt.Errorf("model name is required")}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -305,12 +301,10 @@ func (m *MistralModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -378,11 +372,10 @@ func (m *MistralModel) TranscribeAudio(ctx context.Context, modelName *string, freturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.ASR)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -506,11 +499,10 @@ func (m *MistralModel) AudioSpeech(ctx context.Context, modelName *string, audioreturn nil, fmt.Errorf("text content is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": strings.TrimSpace(*modelName),@@ -590,11 +582,10 @@ func (m *MistralModel) OCRFile(ctx context.Context, modelName *string, content [return nil, fmt.Errorf("file url or content is required")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.OCR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.OCR)var docURL stringif urls != nil && *urls != "" {diff --git a/internal/entity/models/model_test.go b/internal/entity/models/model_test.goindex 8ebab3172a..9c89be14f1 100644--- a/internal/entity/models/model_test.go+++ b/internal/entity/models/model_test.go@@ -76,6 +76,88 @@ func TestOpenAIAPICompatibleDeclaresRerankSuffix(t *testing.T) {}}+// providerConfDir locates conf/models relative to the test's CWD.+func providerConfDir(t *testing.T) string {+ t.Helper()++ for _, candidate := range []string{+ filepath.Join("..", "..", "..", "conf", "models"),+ filepath.Join("conf", "models"),+ } {+ if info, err := os.Stat(candidate); err == nil && info.IsDir() {+ return candidate+ }+ }++ t.Fatal("could not locate conf/models")+ return ""+}++// A provider keeps the API version either in its base URL (OpenAI-compatible+// shape: base ".../v1" + suffix "chat/completions") or in url_suffix (MiniMax+// shape: base "https://api.minimaxi.com" + suffix "v1/text/chatcompletion_v2").+// url_hint is the example endpoint shown in the base URL field, so a hint that+// carries the version the suffix already supplies makes every request 404 on a+// doubled "/v1/v1/..." as soon as the user pastes it. GPUStack shipped exactly+// that hint before joinURL deduplicated the segment.+func TestProviderConfURLHintsFollowVersionConvention(t *testing.T) {+ dir := providerConfDir(t)+ entries, err := os.ReadDir(dir)+ if err != nil {+ t.Fatalf("read %s: %v", dir, err)+ }++ checked := 0+ for _, entry := range entries {+ if entry.IsDir() || filepath.Ext(entry.Name()) != ".json" {+ continue+ }+ raw, err := os.ReadFile(filepath.Join(dir, entry.Name()))+ if err != nil {+ t.Fatalf("read %s: %v", entry.Name(), err)+ }++ var cfg struct {+ Name string `json:"name"`+ URLHint string `json:"url_hint"`+ URLSuffix map[string]any `json:"url_suffix"`+ }+ if err := json.Unmarshal(raw, &cfg); err != nil {+ t.Fatalf("parse %s: %v", entry.Name(), err)+ }+ if cfg.URLHint == "" {+ continue+ }++ trimmed := strings.TrimRight(strings.TrimSpace(cfg.URLHint), "/")+ idx := strings.LastIndex(trimmed, "/")+ if idx < 0 {+ continue+ }+ hintVersion := apiVersionSegment(trimmed[idx+1:])+ if hintVersion == "" {+ continue+ }++ checked+++ for key, value := range cfg.URLSuffix {+ suffix, ok := value.(string)+ if !ok {+ continue+ }+ if apiVersionSegment(firstPathSegment(suffix)) == hintVersion {+ t.Errorf("%s: url_hint %q ends with %q but url_suffix.%s also starts with it; "++ "the version must live in one place only",+ entry.Name(), cfg.URLHint, hintVersion, key)+ }+ }+ }++ if checked == 0 {+ t.Fatal("no provider url_hint was checked; conf/models layout changed")+ }+}+// setupProviderTestDir creates a temporary directory populated with provider// config files and conf/all_models.json, then changes the working directory to// it. InitProviderManager hardcodes a read of conf/all_models.json relative todiff --git a/internal/entity/models/modelscope.go b/internal/entity/models/modelscope.goindex 71a4b18d86..347a5af989 100644--- a/internal/entity/models/modelscope.go+++ b/internal/entity/models/modelscope.go@@ -23,7 +23,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// ModelScopeModel implements ModelDriver for ModelScope chat models.@@ -55,17 +54,6 @@ func (m *ModelScopeModel) Name() string {return "ModelScope"}-func normalizeModelScopeBaseURL(base string) string {- trimmed := strings.TrimRight(strings.TrimSpace(base), "/")- if trimmed == "" {- return trimmed- }- if strings.HasSuffix(trimmed, "/v1") {- return strings.TrimSuffix(trimmed, "/v1")- }- return trimmed-}-// ChatWithMessages sends multiple messages with roles and returns the response.func (m *ModelScopeModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {if err := m.baseModel.APIConfigCheck(apiConfig); err != nil {@@ -76,12 +64,10 @@ func (m *ModelScopeModel) ChatWithMessages(ctx context.Context, modelName stringreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = normalizeModelScopeBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -109,12 +95,10 @@ func (m *ModelScopeModel) ChatStreamlyWithSender(ctx context.Context, modelNamereturn err}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = normalizeModelScopeBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true}@@ -163,12 +147,10 @@ func (m *ModelScopeModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = normalizeModelScopeBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/modelscope_test.go b/internal/entity/models/modelscope_test.goindex 7ccdd2a876..d3446339b4 100644--- a/internal/entity/models/modelscope_test.go+++ b/internal/entity/models/modelscope_test.go@@ -42,23 +42,6 @@ func TestModelScopeName(t *testing.T) {}}-func TestNormalizeModelScopeBaseURL(t *testing.T) {- cases := []struct {- in string- want string- }{- {"http://127.0.0.1:8000", "http://127.0.0.1:8000"},- {"http://127.0.0.1:8000/", "http://127.0.0.1:8000"},- {"http://127.0.0.1:8000/v1", "http://127.0.0.1:8000"},- {" http://127.0.0.1:8000/v1/ ", "http://127.0.0.1:8000"},- }- for _, tc := range cases {- if got := normalizeModelScopeBaseURL(tc.in); got != tc.want {- t.Errorf("normalizeModelScopeBaseURL(%q)=%q, want %q", tc.in, got, tc.want)- }- }-}-func TestModelScopeFactoryRoute(t *testing.T) {driver, err := NewModelFactory().CreateModelDriver("ModelScope", map[string]string{"default": "http://unused"}, URLSuffix{})if err != nil {diff --git a/internal/entity/models/moonshot.go b/internal/entity/models/moonshot.goindex 5b57329813..7a50667a55 100644--- a/internal/entity/models/moonshot.go+++ b/internal/entity/models/moonshot.go@@ -92,11 +92,10 @@ func (m *MoonshotModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -138,11 +137,10 @@ func (m *MoonshotModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn fmt.Errorf("sender is required")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)if chatModelConfig != nil {@@ -175,11 +173,10 @@ func (m *MoonshotModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -228,11 +225,10 @@ func (m *MoonshotModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[}apiKey := strings.TrimSpace(*apiConfig.ApiKey)- baseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, m.baseModel.URLSuffix.Balance)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/n1n.go b/internal/entity/models/n1n.goindex 74e82e9c26..4f44520b1f 100644--- a/internal/entity/models/n1n.go+++ b/internal/entity/models/n1n.go@@ -56,8 +56,7 @@ func (n *N1NModel) endpointURL(region, suffix string) (string, error) {if err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(suffix, "/")), nil+ return joinURL(baseURL, suffix), nil}func n1nRegion(apiConfig *APIConfig) string {diff --git a/internal/entity/models/novita.go b/internal/entity/models/novita.goindex f81715268e..7409f8f2e3 100644--- a/internal/entity/models/novita.go+++ b/internal/entity/models/novita.go@@ -61,12 +61,10 @@ func (n *NovitaModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- baseURL, err := n.baseModel.GetBaseURL(apiConfig)+ url, err := n.baseModel.EndpointURL(apiConfig, n.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -104,12 +102,10 @@ func (n *NovitaModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn err}- baseURL, err := n.baseModel.GetBaseURL(apiConfig)+ url, err := n.baseModel.EndpointURL(apiConfig, n.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)if chatModelConfig != nil {@@ -306,12 +302,10 @@ func (n *NovitaModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- baseURL, err := n.baseModel.GetBaseURL(apiConfig)+ url, err := n.baseModel.EndpointURL(apiConfig, n.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -388,12 +382,10 @@ func (n *NovitaModel) Embed(ctx context.Context, modelName *string, request Embereturn nil, fmt.Errorf("model name is required")}- baseURL, err := n.baseModel.GetBaseURL(apiConfig)+ url, err := n.baseModel.EndpointURL(apiConfig, n.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -510,7 +502,7 @@ func (n *NovitaModel) Rerank(ctx context.Context, modelName *string, request Rerif n.baseModel.URLSuffix.Rerank == "" {return nil, fmt.Errorf("novita: no rerank URL suffix configured")}- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Rerank)+ url := joinURL(baseURL, n.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 && rerankConfig.TopN < topN {@@ -590,11 +582,10 @@ func (n *NovitaModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[streturn nil, err}- baseURL, err := n.baseModel.GetBaseURL(apiConfig)+ url, err := n.baseModel.EndpointURL(apiConfig, n.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, n.baseModel.URLSuffix.Balance)// Build request bodyreqBody := map[string]interface{}{}diff --git a/internal/entity/models/nvidia.go b/internal/entity/models/nvidia.goindex 9081166cc2..ee0ce27bd2 100644--- a/internal/entity/models/nvidia.go+++ b/internal/entity/models/nvidia.go@@ -85,7 +85,7 @@ func (n *NvidiaModel) resolveEndpoint(modelName string, apiConfig *APIConfig, suif err != nil {return "", err}- return fmt.Sprintf("%s/%s", strings.TrimRight(resolvedBaseURL, "/"), strings.TrimLeft(suffix, "/")), nil+ return joinURL(resolvedBaseURL, suffix), nil}func (n *NvidiaModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {diff --git a/internal/entity/models/ollama.go b/internal/entity/models/ollama.goindex bf40b9d3ea..2cff523213 100644--- a/internal/entity/models/ollama.go+++ b/internal/entity/models/ollama.go@@ -151,12 +151,12 @@ func (o *OllamaModel) ChatWithMessages(ctx context.Context, modelName string, meif err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, o.baseModel.URLSuffix.Chat)// For qwen/glm models, use async chat endpointmodelType := strings.Split(modelName, "_")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, o.baseModel.URLSuffix.AsyncChat)}// Build request body@@ -187,10 +187,10 @@ func (o *OllamaModel) ChatStreamlyWithSender(ctx context.Context, modelName striif err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, o.baseModel.URLSuffix.Chat)modelType := strings.Split(modelName, "-")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, o.baseModel.URLSuffix.AsyncChat)}// Build request body with streaming enabled@@ -340,7 +340,7 @@ func (o *OllamaModel) Embed(ctx context.Context, modelName *string, request Embereturn nil, fmt.Errorf("missing base URL: please configure the local access address for Ollama (e.g., http://127.0.0.1:11434/v1)")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), o.baseModel.URLSuffix.Embedding)+ url := joinURL(baseURL, o.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -455,7 +455,7 @@ func (o *OllamaModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, fmt.Errorf("missing base URL: please configure the local access address for Ollama (e.g., http://127.0.0.1:11434)")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), o.baseModel.URLSuffix.Models)+ url := joinURL(baseURL, o.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/openai.go b/internal/entity/models/openai.goindex 1e6ab5fa08..93ce151c10 100644--- a/internal/entity/models/openai.go+++ b/internal/entity/models/openai.go@@ -67,12 +67,10 @@ func (o *OpenAIModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, o.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -103,12 +101,10 @@ func (o *OpenAIModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn fmt.Errorf("messages is empty")}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, o.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{@@ -168,12 +164,10 @@ func (o *OpenAIModel) Embed(ctx context.Context, modelName *string, request Embereturn nil, fmt.Errorf("model name is required")}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, o.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -249,12 +243,10 @@ func (o *OpenAIModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, o.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -525,12 +517,10 @@ func (o *OpenAIModel) newOpenAIASRRequest(ctx context.Context, modelName *stringreturn nil, "", fmt.Errorf("openai ASR URL suffix is required")}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.ASR)if err != nil {return nil, "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(o.baseModel.URLSuffix.ASR, "/"))var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -601,12 +591,10 @@ func (o *OpenAIModel) newOpenAITTSRequest(ctx context.Context, modelName *stringreturn nil, "", fmt.Errorf("openai TTS URL suffix is required")}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.TTS)if err != nil {return nil, "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(o.baseModel.URLSuffix.TTS, "/"))reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/openai_api_compatible.go b/internal/entity/models/openai_api_compatible.goindex 3ff7117a7a..480dd3f692 100644--- a/internal/entity/models/openai_api_compatible.go+++ b/internal/entity/models/openai_api_compatible.go@@ -89,11 +89,10 @@ func (m *OpenAIAPICompatibleModel) ChatWithMessages(ctx context.Context, modelNareturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -120,11 +119,10 @@ func (m *OpenAIAPICompatibleModel) ChatStreamlyWithSender(ctx context.Context, mreturn fmt.Errorf("sender is required")}- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, m.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(chatModelConfig, modelName, messages, true)@@ -182,11 +180,10 @@ func (m *OpenAIAPICompatibleModel) AudioSpeech(ctx context.Context, modelName *sreqCtx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), strings.TrimPrefix(m.baseModel.URLSuffix.TTS, "/"))reqBody := map[string]interface{}{"model": *modelName,@@ -265,11 +262,10 @@ func (m *OpenAIAPICompatibleModel) TranscribeAudio(ctx context.Context, modelNamreqCtx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()- resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)+ url, err := m.baseModel.EndpointURL(apiConfig, m.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), strings.TrimPrefix(m.baseModel.URLSuffix.ASR, "/"))var body bytes.Bufferwriter := multipart.NewWriter(&body)diff --git a/internal/entity/models/openrouter.go b/internal/entity/models/openrouter.goindex 86c9b75074..df3fc85c7b 100644--- a/internal/entity/models/openrouter.go+++ b/internal/entity/models/openrouter.go@@ -62,11 +62,10 @@ func (o *OpenRouterModel) ChatWithMessages(ctx context.Context, modelName stringreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -106,7 +105,7 @@ func (o *OpenRouterModel) ChatStreamlyWithSender(ctx context.Context, modelName// the non-stream path. The previous qwen/glm branch routed to URLSuffix.AsyncChat,// which OpenRouter does not configure (empty suffix) — producing a broken URL and// breaking streaming for every qwen/glm model.- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, o.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -156,11 +155,10 @@ func (o *OpenRouterModel) Embed(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -279,11 +277,10 @@ func (o *OpenRouterModel) Rerank(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("failed to marshal request: %w", err)}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), o.baseModel.URLSuffix.Rerank)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -396,11 +393,10 @@ func (o *OpenRouterModel) TranscribeAudio(ctx context.Context, modelName *stringreturn nil, fmt.Errorf("failed to marshal request: %w", err)}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), o.baseModel.URLSuffix.ASR)ctx, cancel := context.WithTimeout(ctx, longOpCallTimeout)defer cancel()@@ -448,11 +444,10 @@ func (o *OpenRouterModel) AudioSpeech(ctx context.Context, modelName *string, aureturn nil, fmt.Errorf("text content is empty")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.TTS)// OpenRouter:response Audio bytes streamreqBody := map[string]interface{}{@@ -522,11 +517,10 @@ func (o *OpenRouterModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}@@ -580,11 +574,10 @@ func (o *OpenRouterModel) Balance(ctx context.Context, apiConfig *APIConfig) (mareturn nil, err}- baseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, o.baseModel.URLSuffix.Balance)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/orcarouter.go b/internal/entity/models/orcarouter.goindex d36c137460..83e365ac43 100644--- a/internal/entity/models/orcarouter.go+++ b/internal/entity/models/orcarouter.go@@ -56,11 +56,10 @@ func (o *OrcaRouterModel) ChatWithMessages(ctx context.Context, modelName stringreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -86,11 +85,10 @@ func (o *OrcaRouterModel) ChatStreamlyWithSender(ctx context.Context, modelNamereturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -131,11 +129,10 @@ func (o *OrcaRouterModel) AudioSpeech(ctx context.Context, modelName *string, aureturn nil, fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,@@ -203,11 +200,10 @@ func (o *OrcaRouterModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- resolvedBaseURL, err := o.baseModel.GetBaseURL(apiConfig)+ url, err := o.baseModel.EndpointURL(apiConfig, o.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, o.baseModel.URLSuffix.Models)reqBody := map[string]string{}diff --git a/internal/entity/models/paddleocr.go b/internal/entity/models/paddleocr.goindex 5f4cd5b798..0663a2b244 100644--- a/internal/entity/models/paddleocr.go+++ b/internal/entity/models/paddleocr.go@@ -254,11 +254,10 @@ func (p *PaddleOCRModel) OCRFile(ctx context.Context, modelName *string, contentreturn nil, fmt.Errorf("content and fileURL cannot be both empty")}- resolvedBaseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.OCR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, p.baseModel.URLSuffix.OCR)optionalPayload := map[string]bool{"useDocOrientationClassify": false,diff --git a/internal/entity/models/paddleocr_local.go b/internal/entity/models/paddleocr_local.goindex 6e0b224ebc..d1ed10779f 100644--- a/internal/entity/models/paddleocr_local.go+++ b/internal/entity/models/paddleocr_local.go@@ -109,11 +109,10 @@ func (p *PaddleOCRLocalModel) OCRFile(ctx context.Context, modelName *string, coalgorithm := paddleOCRAlgorithm(ocrConfig, apiConfig)apiConfig = paddleOCRResolvedAPIConfig(apiConfig)- resolvedBaseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.OCR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, p.baseModel.URLSuffix.OCR)base64Str := base64.StdEncoding.EncodeToString(content)diff --git a/internal/entity/models/perplexity.go b/internal/entity/models/perplexity.goindex 566e7beb8c..3fe77f6be9 100644--- a/internal/entity/models/perplexity.go+++ b/internal/entity/models/perplexity.go@@ -62,7 +62,7 @@ func (p *PerplexityModel) chatURL(apiConfig *APIConfig) (string, error) {return "", err}baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, p.baseModel.URLSuffix.Chat), nil+ return joinURL(baseURL, p.baseModel.URLSuffix.Chat), nil}func (p *PerplexityModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {@@ -137,12 +137,10 @@ func (p *PerplexityModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- baseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, p.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -210,12 +208,10 @@ func (p *PerplexityModel) Embed(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- baseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, p.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/ppio.go b/internal/entity/models/ppio.goindex a48d2bd4a7..847a235bce 100644--- a/internal/entity/models/ppio.go+++ b/internal/entity/models/ppio.go@@ -57,8 +57,7 @@ func (p *PPIOModel) endpoint(apiConfig *APIConfig, suffix string) (string, errorif err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(suffix, "/")), nil+ return joinURL(baseURL, suffix), nil}func (p *PPIOModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {@@ -203,12 +202,10 @@ func (p *PPIOModel) Embed(ctx context.Context, modelName *string, request EmbedRreturn nil, fmt.Errorf("model name is required")}- baseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, p.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -297,11 +294,10 @@ func (p *PPIOModel) Rerank(ctx context.Context, modelName *string, request Reranreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := p.baseModel.GetBaseURL(apiConfig)+ url, err := p.baseModel.EndpointURL(apiConfig, p.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), p.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 {diff --git a/internal/entity/models/qiniu.go b/internal/entity/models/qiniu.goindex 0c39bfc38b..3e5ae1de97 100644--- a/internal/entity/models/qiniu.go+++ b/internal/entity/models/qiniu.go@@ -146,11 +146,10 @@ func (q *QiniuModel) ChatWithMessages(ctx context.Context, modelName string, mesreturn nil, fmt.Errorf("no messages")}- resolvedBaseURL, err := q.baseModel.GetBaseURL(apiConfig)+ url, err := q.baseModel.EndpointURL(apiConfig, q.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, q.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -179,7 +178,7 @@ func (q *QiniuModel) ChatStreamlyWithSender(ctx context.Context, modelName strinreturn err}baseURL := strings.TrimSuffix(resolvedBaseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, q.baseModel.URLSuffix.Chat)+ url := joinURL(baseURL, q.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true}@@ -236,7 +235,7 @@ func (q *QiniuModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lireturn nil, err}baseURL := strings.TrimSuffix(resolvedBaseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, q.baseModel.URLSuffix.Models)+ url := joinURL(baseURL, q.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/ragcon.go b/internal/entity/models/ragcon.goindex 4d0ba4261f..aec23acceb 100644--- a/internal/entity/models/ragcon.go+++ b/internal/entity/models/ragcon.go@@ -63,7 +63,7 @@ func (r *RAGconModel) chatURL(apiConfig *APIConfig) (string, error) {return "", err}baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, r.baseModel.URLSuffix.Chat), nil+ return joinURL(baseURL, r.baseModel.URLSuffix.Chat), nil}func (r *RAGconModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {@@ -146,12 +146,10 @@ func (r *RAGconModel) Embed(ctx context.Context, modelName *string, request Embereturn []EmbeddingData{}, nil}- baseURL, err := r.baseModel.GetBaseURL(apiConfig)+ url, err := r.baseModel.EndpointURL(apiConfig, r.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, r.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -216,12 +214,10 @@ func (r *RAGconModel) Rerank(ctx context.Context, modelName *string, request Rerreturn &RerankResponse{}, nil}- baseURL, err := r.baseModel.GetBaseURL(apiConfig)+ url, err := r.baseModel.EndpointURL(apiConfig, r.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, r.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN != 0 {@@ -290,12 +286,10 @@ func (r *RAGconModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- baseURL, err := r.baseModel.GetBaseURL(apiConfig)+ url, err := r.baseModel.EndpointURL(apiConfig, r.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, r.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -350,12 +344,10 @@ func (r *RAGconModel) newASRRequest(ctx context.Context, modelName *string, filereturn nil, "", fmt.Errorf("file is missing")}- baseURL, err := r.baseModel.GetBaseURL(apiConfig)+ url, err := r.baseModel.EndpointURL(apiConfig, r.baseModel.URLSuffix.ASR)if err != nil {return nil, "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(r.baseModel.URLSuffix.ASR, "/"))var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -524,12 +516,10 @@ func (r *RAGconModel) newTTSRequest(ctx context.Context, modelName *string, audireturn nil, "", fmt.Errorf("audio content is empty")}- baseURL, err := r.baseModel.GetBaseURL(apiConfig)+ url, err := r.baseModel.EndpointURL(apiConfig, r.baseModel.URLSuffix.TTS)if err != nil {return nil, "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(r.baseModel.URLSuffix.TTS, "/"))reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/replicate.go b/internal/entity/models/replicate.goindex ca4ffb3580..fdb0c6bd15 100644--- a/internal/entity/models/replicate.go+++ b/internal/entity/models/replicate.go@@ -89,8 +89,7 @@ func (r *ReplicateModel) endpoint(apiConfig *APIConfig, suffix string) (string,if err != nil {return "", err}- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, suffix), nil+ return joinURL(baseURL, suffix), nil}func replicateUsesVersionEndpoint(modelName string) bool {diff --git a/internal/entity/models/siliconflow.go b/internal/entity/models/siliconflow.goindex fd44dbb91c..3daea3a13c 100644--- a/internal/entity/models/siliconflow.go+++ b/internal/entity/models/siliconflow.go@@ -65,11 +65,10 @@ func (s *SiliconflowModel) ChatWithMessages(ctx context.Context, modelName strinreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -100,11 +99,10 @@ func (s *SiliconflowModel) ChatStreamlyWithSender(ctx context.Context, modelNamereturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(chatModelConfig, modelName, messages, true)@@ -164,11 +162,10 @@ func (s *SiliconflowModel) Embed(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), s.baseModel.URLSuffix.Embedding)apiKey := *apiConfig.ApiKey@@ -247,11 +244,10 @@ func (s *SiliconflowModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.Models)// Build request bodyreqBody := map[string]interface{}{}@@ -311,13 +307,11 @@ func (s *SiliconflowModel) Balance(ctx context.Context, apiConfig *APIConfig) (mreturn nil, err}- baseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Balance)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), s.baseModel.URLSuffix.Balance)-ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -456,11 +450,10 @@ func (s *SiliconflowModel) Rerank(ctx context.Context, modelName *string, requesreturn nil, fmt.Errorf("failed to marshal request: %w", err)}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), s.baseModel.URLSuffix.Rerank)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -518,11 +511,10 @@ func (s *SiliconflowModel) TranscribeAudio(ctx context.Context, modelName *strinreturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -671,11 +663,10 @@ func (s *SiliconflowModel) AudioSpeech(ctx context.Context, modelName *string, areturn nil, fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.TTS)jsonData, err := json.Marshal(siliconflowTTSRequestBody(*modelName, *audioContent, ttsConfig, false))if err != nil {@@ -720,11 +711,10 @@ func (s *SiliconflowModel) AudioSpeechWithSender(ctx context.Context, modelNamereturn fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.TTS)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.TTS)jsonData, err := json.Marshal(siliconflowTTSRequestBody(*modelName, *audioContent, ttsConfig, true))if err != nil {diff --git a/internal/entity/models/stepfun.go b/internal/entity/models/stepfun.goindex 6882673c2b..846007a914 100644--- a/internal/entity/models/stepfun.go+++ b/internal/entity/models/stepfun.go@@ -25,7 +25,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// StepFunModel implements ModelDriver for StepFun (阶跃星辰).@@ -62,12 +61,10 @@ func (s *StepFunModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, s.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := s.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -92,12 +89,10 @@ func (s *StepFunModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("messages is empty")}- baseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, s.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true,@@ -119,12 +114,10 @@ func (s *StepFunModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, s.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -203,11 +196,10 @@ func (s *StepFunModel) AudioSpeech(ctx context.Context, modelName *string, audioreturn nil, fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,@@ -264,11 +256,10 @@ func (s *StepFunModel) AudioSpeechWithSender(ctx context.Context, modelName *strreturn fmt.Errorf("audio content is empty")}- resolvedBaseURL, err := s.baseModel.GetBaseURL(apiConfig)+ url, err := s.baseModel.EndpointURL(apiConfig, s.baseModel.URLSuffix.TTS)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, s.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,diff --git a/internal/entity/models/togetherai.go b/internal/entity/models/togetherai.goindex 450a865e68..5f6ffe09e2 100644--- a/internal/entity/models/togetherai.go+++ b/internal/entity/models/togetherai.go@@ -73,13 +73,7 @@ func applyTogetherAIReasoningRequestParams(reqBody map[string]any, modelName str}func (t *TogetherAIModel) chatURL(apiConfig *APIConfig) (string, error) {-- baseURL, err := t.baseModel.GetBaseURL(apiConfig)- if err != nil {- return "", err- }- baseURL = strings.TrimSuffix(baseURL, "/")- return fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Chat), nil+ return t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Chat)}func (t *TogetherAIModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {@@ -152,12 +146,10 @@ func (t *TogetherAIModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- baseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -221,12 +213,10 @@ func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- baseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -307,11 +297,10 @@ func (t *TogetherAIModel) Rerank(ctx context.Context, modelName *string, requestreturn &RerankResponse{}, nil}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.Rerank)var topN = rerankConfig.TopNif rerankConfig.TopN != 0 {@@ -389,11 +378,10 @@ func (t *TogetherAIModel) TranscribeAudio(ctx context.Context, modelName *stringreturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.ASR)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -496,11 +484,10 @@ func (t *TogetherAIModel) AudioSpeech(ctx context.Context, modelName *string, aureturn nil, fmt.Errorf("text content is missing")}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,@@ -556,13 +543,10 @@ func (t *TogetherAIModel) AudioSpeechWithSender(ctx context.Context, modelName *return fmt.Errorf("text content is missing")}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.TTS)if err != nil {return err}- cleanBaseURL := strings.TrimRight(resolvedBaseURL, "/")- cleanSuffix := strings.TrimLeft(t.baseModel.URLSuffix.TTS, "/")- url := fmt.Sprintf("%s/%s", cleanBaseURL, cleanSuffix)// Build Request bodyreqBody := map[string]interface{}{diff --git a/internal/entity/models/tokenhub.go b/internal/entity/models/tokenhub.goindex 89f7202ac6..02f5168fd1 100644--- a/internal/entity/models/tokenhub.go+++ b/internal/entity/models/tokenhub.go@@ -67,11 +67,10 @@ func (t *TokenHubModel) ChatWithMessages(ctx context.Context, modelName string,return nil, err}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := t.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -97,11 +96,10 @@ func (t *TokenHubModel) ChatStreamlyWithSender(ctx context.Context, modelName streturn err}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true}@@ -122,11 +120,10 @@ func (t *TokenHubModel) Embed(ctx context.Context, modelName *string, request Emreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -223,11 +220,10 @@ func (t *TokenHubModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([return nil, err}- resolvedBaseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, t.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/tokenpony.go b/internal/entity/models/tokenpony.goindex 2dad871c5e..c434540b94 100644--- a/internal/entity/models/tokenpony.go+++ b/internal/entity/models/tokenpony.go@@ -23,7 +23,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// TokenPonyModel implements ModelDriver for TokenPony. TokenPony is a@@ -59,12 +58,10 @@ func (t *TokenPonyModel) ChatWithMessages(ctx context.Context, modelName string,return nil, fmt.Errorf("messages is empty")}- baseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := t.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -91,12 +88,10 @@ func (t *TokenPonyModel) ChatStreamlyWithSender(ctx context.Context, modelName sreturn err}- baseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]any{"include_usage": true}@@ -110,12 +105,10 @@ func (t *TokenPonyModel) ListModels(ctx context.Context, apiConfig *APIConfig) (return nil, err}- baseURL, err := t.baseModel.GetBaseURL(apiConfig)+ url, err := t.baseModel.EndpointURL(apiConfig, t.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, t.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/upstage.go b/internal/entity/models/upstage.goindex 6665f58af6..fc9ee773fc 100644--- a/internal/entity/models/upstage.go+++ b/internal/entity/models/upstage.go@@ -24,7 +24,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// UpstageModel implements ModelDriver for Upstage (Solar models).@@ -61,12 +60,10 @@ func (u *UpstageModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := u.baseModel.GetBaseURL(apiConfig)+ url, err := u.baseModel.EndpointURL(apiConfig, u.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, u.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -97,12 +94,10 @@ func (u *UpstageModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("messages is empty")}- baseURL, err := u.baseModel.GetBaseURL(apiConfig)+ url, err := u.baseModel.EndpointURL(apiConfig, u.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, u.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)if chatModelConfig != nil {@@ -149,12 +144,10 @@ func (u *UpstageModel) Embed(ctx context.Context, modelName *string, request Embreturn nil, fmt.Errorf("model name is required")}- baseURL, err := u.baseModel.GetBaseURL(apiConfig)+ url, err := u.baseModel.EndpointURL(apiConfig, u.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, u.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -227,12 +220,10 @@ func (u *UpstageModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := u.baseModel.GetBaseURL(apiConfig)+ url, err := u.baseModel.EndpointURL(apiConfig, u.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, u.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/vllm.go b/internal/entity/models/vllm.goindex b0d91d89da..93f6343568 100644--- a/internal/entity/models/vllm.go+++ b/internal/entity/models/vllm.go@@ -100,12 +100,12 @@ func (v *VllmModel) ChatWithMessages(ctx context.Context, modelName string, messif err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, v.baseModel.URLSuffix.Chat)// For qwen/glm models, use async chat endpointmodelType := strings.Split(modelName, "-")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, v.baseModel.URLSuffix.AsyncChat)}// Build request body@@ -134,10 +134,10 @@ func (v *VllmModel) ChatStreamlyWithSender(ctx context.Context, modelName stringif err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Chat)+ url := joinURL(resolvedBaseURL, v.baseModel.URLSuffix.Chat)modelType := strings.Split(modelName, "-")[0]if modelType == "qwen" || modelType == "glm" {- url = fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.AsyncChat)+ url = joinURL(resolvedBaseURL, v.baseModel.URLSuffix.AsyncChat)}// Build request body with streaming enabled@@ -191,7 +191,7 @@ func (v *VllmModel) Embed(ctx context.Context, modelName *string, request EmbedRreturn nil, fmt.Errorf("missing base URL: please configure the local access address for vLLM (e.g., http://127.0.0.1:8000/v1)")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), v.baseModel.URLSuffix.Embedding)+ url := joinURL(baseURL, v.baseModel.URLSuffix.Embedding)reqBody := map[string]interface{}{"model": *modelName,@@ -276,7 +276,7 @@ func (v *VllmModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lisreturn nil, fmt.Errorf("missing base URL: please configure the local access address for vLLM (e.g., http://127.0.0.1:8000/v1)")}- url := fmt.Sprintf("%s/%s", baseURL, v.baseModel.URLSuffix.Models)+ url := joinURL(baseURL, v.baseModel.URLSuffix.Models)reqBody := map[string]interface{}{}@@ -397,7 +397,7 @@ func (v *VllmModel) Rerank(ctx context.Context, modelName *string, request Reranreturn nil, fmt.Errorf("missing base URL: please configure the local access address for vLLM (e.g., http://127.0.0.1:8000/v1)")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), v.baseModel.URLSuffix.Rerank)+ url := joinURL(baseURL, v.baseModel.URLSuffix.Rerank)topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 && rerankConfig.TopN < topN {diff --git a/internal/entity/models/volcengine.go b/internal/entity/models/volcengine.goindex 6161685dc8..4481cf2a4b 100644--- a/internal/entity/models/volcengine.go+++ b/internal/entity/models/volcengine.go@@ -95,11 +95,10 @@ func (v *VolcEngine) ChatWithMessages(ctx context.Context, modelName string, mesreturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -166,11 +165,10 @@ func (v *VolcEngine) ChatStreamlyWithSender(ctx context.Context, modelName strinreturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -273,11 +271,10 @@ func (v *VolcEngine) Embed(ctx context.Context, modelName *string, request Embedreturn nil, fmt.Errorf("model name is required")}- resolvedBaseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Embedding)var embeddings []EmbeddingDatavar totalUsage TokenUsage@@ -473,17 +470,14 @@ func (v *VolcEngine) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lireturn nil, err}- resolvedBaseURL, err := v.baseModel.GetBaseURL(apiConfig)- if err != nil {- return nil, err- }-modelsSuffix := strings.Trim(strings.TrimSpace(v.baseModel.URLSuffix.Models), "/")if modelsSuffix == "" {return nil, fmt.Errorf("volcengine: models URL suffix is not configured")}-- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), modelsSuffix)+ url, err := v.baseModel.EndpointURL(apiConfig, modelsSuffix)+ if err != nil {+ return nil, err+ }ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -559,11 +553,10 @@ func (v *VolcEngine) CheckConnection(ctx context.Context, apiConfig *APIConfig)return err}- resolvedBaseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Files)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, v.baseModel.URLSuffix.Files)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/voyage.go b/internal/entity/models/voyage.goindex 20d070544f..3cefbe5768 100644--- a/internal/entity/models/voyage.go+++ b/internal/entity/models/voyage.go@@ -24,7 +24,6 @@ import ("io""net/http""ragflow/internal/common"- "strings")// VoyageModel implements ModelDriver for Voyage AI.@@ -76,12 +75,10 @@ func (v *VoyageModel) Embed(ctx context.Context, modelName *string, request Embereturn nil, fmt.Errorf("model name is required")}- baseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), v.baseModel.URLSuffix.Embedding)// Python VoyageEmbed.embed passes input_type="document"; encode_queries// passes "query". The Voyage API applies a different (asymmetric) encoding@@ -189,12 +186,10 @@ func (v *VoyageModel) Rerank(ctx context.Context, modelName *string, request Rerreturn nil, fmt.Errorf("model name is required")}- baseURL, err := v.baseModel.GetBaseURL(apiConfig)+ url, err := v.baseModel.EndpointURL(apiConfig, v.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), v.baseModel.URLSuffix.Rerank)topK := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 {diff --git a/internal/entity/models/xai.go b/internal/entity/models/xai.goindex 9637617747..bfc038c976 100644--- a/internal/entity/models/xai.go+++ b/internal/entity/models/xai.go@@ -72,12 +72,10 @@ func (x *XAIModel) ChatWithMessages(ctx context.Context, modelName string, messareturn nil, fmt.Errorf("messages is empty")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)body, err := x.baseModel.doRequest(ctx, url, apiConfig, reqBody, nonStreamCallTimeout)@@ -98,12 +96,10 @@ func (x *XAIModel) ChatStreamlyWithSender(ctx context.Context, modelName string,return fmt.Errorf("messages is empty")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = strings.TrimSuffix(baseURL, "/")- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true,@@ -126,16 +122,14 @@ func (x *XAIModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Listreturn nil, err}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)- if err != nil {- return nil, err- }- baseURL = strings.TrimSuffix(baseURL, "/")modelsSuffix := strings.Trim(strings.TrimSpace(x.baseModel.URLSuffix.Models), "/")if modelsSuffix == "" {return nil, fmt.Errorf("xai: models URL suffix is not configured")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), modelsSuffix)+ url, err := x.baseModel.EndpointURL(apiConfig, modelsSuffix)+ if err != nil {+ return nil, err+ }body, err := x.baseModel.doGetRequest(ctx, url, apiConfig, nonStreamCallTimeout)if err != nil {@@ -183,11 +177,10 @@ func (x *XAIModel) TranscribeAudio(ctx context.Context, modelName *string, filereturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.ASR)// multipart bodyvar body bytes.Buffer@@ -317,11 +310,10 @@ func (x *XAIModel) AudioSpeech(ctx context.Context, modelName *string, audioContreturn nil, fmt.Errorf("text content is missing")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"text": *audioContent,diff --git a/internal/entity/models/xiaomi.go b/internal/entity/models/xiaomi.goindex a9a1f9d78d..8c0d43fd1c 100644--- a/internal/entity/models/xiaomi.go+++ b/internal/entity/models/xiaomi.go@@ -69,11 +69,10 @@ func (x *XiaomiModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.Chat)// Build request bodyreqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -116,11 +115,10 @@ func (x *XiaomiModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn fmt.Errorf("messages is empty")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Chat)// Build request body with streaming enabledreqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -322,11 +320,10 @@ func (x *XiaomiModel) newXiaomiASRRequest(ctx context.Context, modelName *stringreturn nil, fmt.Errorf("failed to marshal request: %w", err)}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(x.baseModel.URLSuffix.Chat, "/"))req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer(jsonData))if err != nil {@@ -516,11 +513,10 @@ func (x *XiaomiModel) newXiaomiTTSRequest(ctx context.Context, modelName *stringreturn nil, fmt.Errorf("failed to marshal request: %w", err)}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(x.baseModel.URLSuffix.Chat, "/"))req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer(jsonData))if err != nil {@@ -612,15 +608,14 @@ func (x *XiaomiModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)- if err != nil {- return nil, err- }modelsSuffix := strings.Trim(strings.TrimSpace(x.baseModel.URLSuffix.Models), "/")if modelsSuffix == "" {return nil, fmt.Errorf("xiaomi: models URL suffix is not configured")}- url := fmt.Sprintf("%s/%s", strings.TrimSuffix(baseURL, "/"), modelsSuffix)+ url, err := x.baseModel.EndpointURL(apiConfig, modelsSuffix)+ if err != nil {+ return nil, err+ }body, err := x.baseModel.doGetRequest(ctx, url, apiConfig, nonStreamCallTimeout)if err != nil {diff --git a/internal/entity/models/xinference.go b/internal/entity/models/xinference.goindex 6e7b30e599..ad6e72b0bf 100644--- a/internal/entity/models/xinference.go+++ b/internal/entity/models/xinference.go@@ -27,7 +27,6 @@ import ("path/filepath""ragflow/internal/common""strconv"- "strings")// XinferenceModel implements ModelDriver for Xinference chat models.@@ -59,17 +58,6 @@ func (x *XinferenceModel) Name() string {return "Xinference"}-func normalizeXinferenceBaseURL(base string) string {- trimmed := strings.TrimRight(strings.TrimSpace(base), "/")- if trimmed == "" {- return trimmed- }- if strings.HasSuffix(trimmed, "/v1") {- return strings.TrimSuffix(trimmed, "/v1")- }- return trimmed-}-// ChatWithMessages sends multiple messages with roles and returns the response.func (x *XinferenceModel) ChatWithMessages(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, chatModelConfig *ChatConfig, modelUsage *common.ModelUsage) (*ChatResponse, error) {if err := x.baseModel.APIConfigCheck(apiConfig); err != nil {@@ -80,12 +68,10 @@ func (x *XinferenceModel) ChatWithMessages(ctx context.Context, modelName stringreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- baseURL = normalizeXinferenceBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)@@ -113,12 +99,10 @@ func (x *XinferenceModel) ChatStreamlyWithSender(ctx context.Context, modelNamereturn fmt.Errorf("stream must be true in ChatStreamlyWithSender")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return err}- baseURL = normalizeXinferenceBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{@@ -151,15 +135,13 @@ func (x *XinferenceModel) Embed(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)- if err != nil {- return nil, err- }- baseURL = normalizeXinferenceBaseURL(baseURL)if x.baseModel.URLSuffix.Embedding == "" {return nil, fmt.Errorf("xinference: no embedding URL suffix configured")}- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Embedding)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Embedding)+ if err != nil {+ return nil, err+ }reqBody := map[string]interface{}{"model": *modelName,@@ -261,15 +243,13 @@ func (x *XinferenceModel) Rerank(ctx context.Context, modelName *string, requestreturn nil, fmt.Errorf("model name is required")}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)- if err != nil {- return nil, err- }- baseURL = normalizeXinferenceBaseURL(baseURL)if x.baseModel.URLSuffix.Rerank == "" {return nil, fmt.Errorf("xinference: no rerank URL suffix configured")}- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Rerank)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Rerank)+ if err != nil {+ return nil, err+ }topN := len(documents)if rerankConfig != nil && rerankConfig.TopN > 0 && rerankConfig.TopN < topN {@@ -349,11 +329,10 @@ func (x *XinferenceModel) TranscribeAudio(ctx context.Context, modelName *stringreturn nil, fmt.Errorf("file is missing")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.ASR)var body bytes.Bufferwriter := multipart.NewWriter(&body)@@ -462,11 +441,10 @@ func (x *XinferenceModel) AudioSpeech(ctx context.Context, modelName *string, aureturn nil, fmt.Errorf("text content is missing")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.TTS)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.TTS)reqBody := map[string]interface{}{"model": *modelName,@@ -534,12 +512,10 @@ func (x *XinferenceModel) ListModels(ctx context.Context, apiConfig *APIConfig)return nil, err}- baseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Models)if err != nil {return nil, err}- baseURL = normalizeXinferenceBaseURL(baseURL)- url := fmt.Sprintf("%s/%s", baseURL, x.baseModel.URLSuffix.Models)ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()diff --git a/internal/entity/models/xinference_test.go b/internal/entity/models/xinference_test.goindex 71b28b49eb..c03869f837 100644--- a/internal/entity/models/xinference_test.go+++ b/internal/entity/models/xinference_test.go@@ -28,23 +28,6 @@ func TestXinferenceName(t *testing.T) {}}-func TestNormalizeXinferenceBaseURL(t *testing.T) {- cases := []struct {- in string- want string- }{- {"http://127.0.0.1:9997", "http://127.0.0.1:9997"},- {"http://127.0.0.1:9997/", "http://127.0.0.1:9997"},- {"http://127.0.0.1:9997/v1", "http://127.0.0.1:9997"},- {" http://127.0.0.1:9997/v1/ ", "http://127.0.0.1:9997"},- }- for _, tc := range cases {- if got := normalizeXinferenceBaseURL(tc.in); got != tc.want {- t.Errorf("normalizeXinferenceBaseURL(%q)=%q, want %q", tc.in, got, tc.want)- }- }-}-func TestXinferenceFactoryRoute(t *testing.T) {driver, err := NewModelFactory().CreateModelDriver("Xinference", map[string]string{"default": "http://unused"}, URLSuffix{})if err != nil {diff --git a/internal/entity/models/xunfei.go b/internal/entity/models/xunfei.goindex b1e630bf7e..c8eac1a2b7 100644--- a/internal/entity/models/xunfei.go+++ b/internal/entity/models/xunfei.go@@ -60,11 +60,10 @@ func (x *XunFeiModel) ChatWithMessages(ctx context.Context, modelName string, mereturn nil, fmt.Errorf("messages is empty")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -98,11 +97,10 @@ func (x *XunFeiModel) ChatStreamlyWithSender(ctx context.Context, modelName strireturn fmt.Errorf("messages is empty")}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Chat)if err != nil {return err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(modelConfig, modelName, messages, true)@@ -166,11 +164,10 @@ func (x *XunFeiModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]Lreturn nil, err}- resolvedBaseURL, err := x.baseModel.GetBaseURL(apiConfig)+ url, err := x.baseModel.EndpointURL(apiConfig, x.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", resolvedBaseURL, x.baseModel.URLSuffix.Models)body, err := x.baseModel.doGetRequest(ctx, url, apiConfig, nonStreamCallTimeout)if err != nil {diff --git a/internal/entity/models/zhipu-ai.go b/internal/entity/models/zhipu-ai.goindex 53715a3747..79bd655e2c 100644--- a/internal/entity/models/zhipu-ai.go+++ b/internal/entity/models/zhipu-ai.go@@ -28,7 +28,6 @@ import ("os""path/filepath""ragflow/internal/common"- "strings")// ZhipuAIModel implements ModelDriver for Zhipu AI@@ -65,12 +64,10 @@ func (z *ZhipuAIModel) ChatWithMessages(ctx context.Context, modelName string, mreturn nil, fmt.Errorf("messages is empty")}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Chat)if err != nil {return nil, err}-- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, false)if chatModelConfig != nil {@@ -105,12 +102,10 @@ func (z *ZhipuAIModel) ChatStreamlyWithSender(ctx context.Context, modelName strreturn fmt.Errorf("messages is empty")}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Chat)if err != nil {return err}-- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Chat)reqBody := buildRequestBody(chatModelConfig, modelName, messages, true)reqBody["stream_options"] = map[string]interface{}{"include_usage": true,@@ -168,13 +163,11 @@ func (z *ZhipuAIModel) Embed(ctx context.Context, modelName *string, request Embreturn nil, fmt.Errorf("model name is required")}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Embedding)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Embedding)-reqBody := map[string]interface{}{}reqBody["model"] = modelNamereqBody["input"] = request.Texts@@ -236,13 +229,11 @@ func (z *ZhipuAIModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]return nil, err}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Models)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Models)-ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -287,13 +278,11 @@ func (z *ZhipuAIModel) CheckConnection(ctx context.Context, apiConfig *APIConfigreturn err}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Files)if err != nil {return err}- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Files)-ctx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)defer cancel()@@ -373,13 +362,11 @@ func (z *ZhipuAIModel) Rerank(ctx context.Context, modelName *string, request Rereturn nil, fmt.Errorf("model name is required")}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.Rerank)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, z.baseModel.URLSuffix.Rerank)-var topN = rerankConfig.TopNif rerankConfig.TopN == 0 {topN = len(documents)@@ -457,13 +444,11 @@ func (z *ZhipuAIModel) TranscribeAudio(ctx context.Context, modelName *string, freturn nil, fmt.Errorf("zhipu-ai: ASR URL suffix is not configured")}- baseURL, err := z.baseModel.GetBaseURL(apiConfig)+ url, err := z.baseModel.EndpointURL(apiConfig, z.baseModel.URLSuffix.ASR)if err != nil {return nil, err}- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(z.baseModel.URLSuffix.ASR, "/"))-var body bytes.Bufferwriter := multipart.NewWriter(&body)if err = writer.WriteField("model", *modelName); err != nil {@@ -709,8 +694,7 @@ func (z *ZhipuAIModel) buildTTSRequest(modelName *string, audioContent *string,}}- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimLeft(z.baseModel.URLSuffix.TTS, "/"))- return reqBody, url, nil+ return reqBody, joinURL(baseURL, z.baseModel.URLSuffix.TTS), nil}// OCRFile OCR file@@ -757,7 +741,7 @@ func (z *ZhipuAIModel) OCRFile(ctx context.Context, modelName *string, content [return nil, fmt.Errorf("failed to marshal request: %w", err)}- url := fmt.Sprintf("%s/%s", baseURL, strings.TrimPrefix(z.baseModel.URLSuffix.OCR, "/"))+ url := joinURL(baseURL, z.baseModel.URLSuffix.OCR)ctx, cancel := context.WithTimeout(ctx, longOpCallTimeout)defer cancel()