From fce2a94fe0da882ab6888efefc4cf1d85985a16b Mon Sep 17 00:00:00 2001
From: euvre <93761161+euvre@users.noreply.github.com>
Date: Thu, 23 Jul 2026 19:37:13 +0800
Subject: [PATCH] fix(go): resolve custom tenant model in LLM agent canvas
 component (#17187)

---
 internal/agent/component/llm.go      | 11 +++++
 internal/agent/component/llm_test.go | 62 ++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/internal/agent/component/llm.go b/internal/agent/component/llm.go
index 2a0535ed06..eb9ebdaa30 100644
--- a/internal/agent/component/llm.go
+++ b/internal/agent/component/llm.go
@@ -314,6 +314,17 @@ func (c *LLMComponent) Name() string { return "LLM" }
 // Invoke runs the LLM and returns the output map.
 func (c *LLMComponent) Invoke(ctx context.Context, inputs map[string]any) (map[string]any, error) {
 	p := mergeLLMParam(c.param, inputs)
+
+	// Resolve tenant-scoped custom models (and fill missing driver/credentials)
+	// before invoking. Without this, a tenant_model.id or a composite model
+	// reference selected in the agent canvas is passed verbatim to the LLM
+	// driver, causing 400s for custom-added models.
+	var err error
+	p.ModelID, p.Driver, p.APIKey, p.BaseURL, err = resolveChatModelRef(ctx, p.ModelID, p.Driver, p.APIKey, p.BaseURL)
+	if err != nil {
+		return nil, fmt.Errorf("component: LLM.Invoke: resolve model: %w", err)
+	}
+
 	if p.ModelID == "" {
 		return nil, &ParamError{Field: "model_id", Reason: "required"}
 	}
diff --git a/internal/agent/component/llm_test.go b/internal/agent/component/llm_test.go
index b977b96ec8..dcab7bc5c6 100644
--- a/internal/agent/component/llm_test.go
+++ b/internal/agent/component/llm_test.go
@@ -18,6 +18,8 @@ import (
 	"slices"
 	"testing"
 
+	"ragflow/internal/entity"
+
 	"github.com/cloudwego/eino/schema"
 )
 
@@ -256,3 +258,63 @@ func TestLLM_ThinkingFieldRoundTrip(t *testing.T) {
 		t.Errorf("arbitrary thinking = %q, want auto (lenient forwarding)", arbitrary.Thinking)
 	}
 }
+
+// TestLLM_ResolvesTenantModelID guards that custom-added tenant models selected
+// in the agent canvas are resolved to their real provider/model name, driver,
+// and credentials before the LLM call is dispatched.
+func TestLLM_ResolvesTenantModelID(t *testing.T) {
+	db := setupComponentTestDB(t)
+	pushComponentDB(t, db)
+
+	if err := db.Create(&entity.TenantModelProvider{
+		ID:           "provider-1",
+		TenantID:     "tenant-1",
+		ProviderName: "DeepSeek",
+	}).Error; err != nil {
+		t.Fatalf("create provider: %v", err)
+	}
+	if err := db.Create(&entity.TenantModelInstance{
+		ID:           "instance-1",
+		ProviderID:   "provider-1",
+		InstanceName: "prod-east",
+		APIKey:       "instance-key",
+		Status:       "active",
+		Extra:        `{"base_url":"https://instance.example"}`,
+	}).Error; err != nil {
+		t.Fatalf("create instance: %v", err)
+	}
+	if err := db.Create(&entity.TenantModel{
+		ID:         "3d2d824e7e5d11f1a845455b140cef90",
+		ProviderID: "provider-1",
+		InstanceID: "instance-1",
+		ModelName:  "deepseek-chat",
+		ModelType:  int(entity.ModelTypeChat),
+		Status:     "active",
+	}).Error; err != nil {
+		t.Fatalf("create model: %v", err)
+	}
+
+	stub := &stubInvoker{resp: &ChatInvokeResponse{Content: "ok", Model: "stub"}}
+	withStubInvoker(t, stub)
+
+	c := NewLLMComponent(LLMParam{ModelID: "3d2d824e7e5d11f1a845455b140cef90"})
+	_, err := c.Invoke(stateWithTenant("tenant-1"), map[string]any{"user_prompt": "hi"})
+	if err != nil {
+		t.Fatalf("Invoke: %v", err)
+	}
+	if stub.captured == nil {
+		t.Fatal("invoker not called")
+	}
+	if got, want := stub.captured.Driver, "DeepSeek"; got != want {
+		t.Errorf("Driver=%q, want %q", got, want)
+	}
+	if got, want := stub.captured.ModelName, "deepseek-chat"; got != want {
+		t.Errorf("ModelName=%q, want %q", got, want)
+	}
+	if got, want := stub.captured.APIKey, "instance-key"; got != want {
+		t.Errorf("APIKey=%q, want %q", got, want)
+	}
+	if got, want := stub.captured.BaseURL, "https://instance.example"; got != want {
+		t.Errorf("BaseURL=%q, want %q", got, want)
+	}
+}