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
Go model: fix MinerU local server URL decoding (#20891)
Jin Hai3f07c7ab7170
diff --git a/internal/entity/models/mineru_local.go b/internal/entity/models/mineru_local.goindex d433ae2e4c..73e25b3602 100644--- a/internal/entity/models/mineru_local.go+++ b/internal/entity/models/mineru_local.go@@ -119,6 +119,10 @@ func (m *MinerULocalModel) CheckConnection(ctx context.Context, apiConfig *APICoif err != nil {return err}+ if !strings.HasPrefix(resolvedBaseURL, "http://") && !strings.HasPrefix(resolvedBaseURL, "https://") {+ resolvedBaseURL = "http://" + resolvedBaseURL+ }+u, err := url.Parse(resolvedBaseURL)if err != nil {return fmt.Errorf("invalid base URL: %w", err)diff --git a/internal/handler/providers.go b/internal/handler/providers.goindex 1cc8364784..512da50eb0 100644--- a/internal/handler/providers.go+++ b/internal/handler/providers.go@@ -17,6 +17,7 @@package handlerimport (+ "bytes""encoding/json""errors""fmt"@@ -412,12 +413,32 @@ func (h *ProviderHandler) ShowModel(c *gin.Context) {type CreateProviderInstanceRequest struct {InstanceName string `json:"instance_name" binding:"required"`- APIKey string `json:"api_key"`+ APIKey json.RawMessage `json:"api_key"`BaseURL string `json:"base_url"`Region string `json:"region"`ModelInfo []service.CreateInstanceModelInfo `json:"model_info"`}+// normalizeAPIKey accepts api_key as either a JSON string or a JSON object+// (credential bundles such as XunFei Spark's+// {"spark_api_password": ..., "spark_app_id": ..., ...}) and normalizes it to+// the string form persisted on the instance.+func normalizeAPIKey(raw json.RawMessage) string {+ trimmed := strings.TrimSpace(string(raw))+ if trimmed == "" || trimmed == "null" {+ return ""+ }+ var s string+ if err := json.Unmarshal(raw, &s); err == nil {+ return s+ }+ var buf bytes.Buffer+ if err := json.Compact(&buf, raw); err != nil {+ return trimmed+ }+ return buf.String()+}+// instanceNamePattern restricts an instance name to digits, underscores,// hyphens, and ASCII letters in both cases.var instanceNamePattern = regexp.MustCompile(`^[0-9A-Za-z_-]+$`)@@ -454,11 +475,12 @@ func (h *ProviderHandler) CreateProviderInstance(c *gin.Context) {}userID := c.GetString("user_id")+ apiKey := normalizeAPIKey(req.APIKey)// If the request body only contains "instance_name", create a name-only// instance without API key validation or model creation.// Mirrors Python's provider_api.py:349 — set(data.keys()) == {"instance_name"}.- if req.APIKey == "" && req.BaseURL == "" && req.Region == "" && len(req.ModelInfo) == 0 {+ if apiKey == "" && req.BaseURL == "" && req.Region == "" && len(req.ModelInfo) == 0 {code, err := h.modelProviderService.CreateNameOnlyProviderInstance(ctx, providerName, req.InstanceName, userID)if err != nil {common.ErrorWithCode(c, code, err.Error())@@ -468,7 +490,7 @@ func (h *ProviderHandler) CreateProviderInstance(c *gin.Context) {return}- code, err := h.modelProviderService.CreateProviderInstance(ctx, providerName, req.InstanceName, req.APIKey, req.BaseURL, req.Region, userID, req.ModelInfo)+ code, err := h.modelProviderService.CreateProviderInstance(ctx, providerName, req.InstanceName, apiKey, req.BaseURL, req.Region, userID, req.ModelInfo)if err != nil {common.ErrorWithCode(c, code, err.Error())return@@ -562,7 +584,7 @@ func (h *ProviderHandler) CheckConnection(c *gin.Context) {}userID := c.GetString("user_id")- errCode, err := h.modelProviderService.CheckConnection(ctx, providerName, req.APIKey, req.Region, req.BaseURL, req.InstanceID, userID, req.ModelInfo)+ errCode, err := h.modelProviderService.CheckConnection(ctx, providerName, normalizeAPIKey(req.APIKey), req.Region, req.BaseURL, req.InstanceID, userID, req.ModelInfo)if err != nil {common.ErrorWithCode(c, errCode, err.Error())return@@ -666,7 +688,7 @@ func (h *ProviderHandler) ShowTask(c *gin.Context) {type AlterProviderInstanceRequest struct {InstanceName string `json:"instance_name"`- APIKey string `json:"api_key"`+ APIKey json.RawMessage `json:"api_key"`BaseURL string `json:"base_url"`Region string `json:"region"`ModelInfo *[]service.CreateInstanceModelInfo `json:"model_info" binding:"required"`@@ -698,7 +720,7 @@ func (h *ProviderHandler) AlterProviderInstance(c *gin.Context) {return}- code, err := h.modelProviderService.AlterProviderInstance(ctx, userID, providerName, instanceName, req.InstanceName, req.APIKey, req.BaseURL, req.Region, *req.ModelInfo)+ code, err := h.modelProviderService.AlterProviderInstance(ctx, userID, providerName, instanceName, req.InstanceName, normalizeAPIKey(req.APIKey), req.BaseURL, req.Region, *req.ModelInfo)if err != nil {common.ErrorWithCode(c, code, err.Error())returndiff --git a/internal/service/model_service.go b/internal/service/model_service.goindex 324de19a1a..0dda834656 100644--- a/internal/service/model_service.go+++ b/internal/service/model_service.go@@ -90,7 +90,7 @@ type CheckConnectionModelInfo struct {}type CheckConnectionRequest struct {- APIKey string `json:"api_key"`+ APIKey json.RawMessage `json:"api_key"`Region string `json:"region"`BaseURL string `json:"base_url"`InstanceID string `json:"instance_id"`