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(agent): save incomplete model selections and gate Run (#21373)
Sbaaoui Idrissbb5774768842
diff --git a/internal/service/agent.go b/internal/service/agent.goindex 20108f4b25..477064ae0b 100644--- a/internal/service/agent.go+++ b/internal/service/agent.go@@ -1201,7 +1201,7 @@ func (s *AgentService) UpdateAgent(ctx context.Context, userID, canvasID string,if err := validateEntries(dslMap); err != nil {return fmt.Errorf("update agent %s: %w", canvasID, err)}- if err := validateAgentChatModels(ctx, userID, canvasInstance.EffectiveTenantID(), dslMap); err != nil {+ if err := validateAgentChatModelReferences(ctx, userID, canvasInstance.EffectiveTenantID(), dslMap, !release); err != nil {return err}updates["dsl"] = entity.JSONMap(dslpkg.NormalizeForCanvas(dslMap))@@ -1341,6 +1341,9 @@ func (s *AgentService) PublishAgent(ctx context.Context, userID, canvasID string}}+ if err := validateAgentChatModels(ctx, userID, canvasInstance.EffectiveTenantID(), dsl); err != nil {+ return nil, err+ }if err := component.ValidateDynamicEntries(dsl); err != nil {return nil, fmt.Errorf("publish agent %s: %w", canvasID, err)}@@ -1929,11 +1932,15 @@ func (s *AgentService) runReleasedAgent(ctx context.Context, userID, canvasID, sreturn s.RunAgent(ctx, userID, canvasID, sessionID, version.ID, userInput, files)}-// validateAgentChatModels rejects stale Agent model references before saving or-// execution. It resolves models in the canvas tenant and checks access for the-// actual caller. Agent components always invoke a chat model; model-free+// validateAgentChatModels rejects stale Agent model references before execution.+// It resolves models in the canvas tenant and checks access for the actual+// caller. Agent components always invoke a chat model; model-free// canvases contain no Agent component and pass through.func validateAgentChatModels(ctx context.Context, userID, tenantID string, dsl map[string]any) error {+ return validateAgentChatModelReferences(ctx, userID, tenantID, dsl, false)+}++func validateAgentChatModelReferences(ctx context.Context, userID, tenantID string, dsl map[string]any, draft bool) error {c, err := canvas.DecodeFromDSL(dsl)if err != nil {return nil@@ -1943,11 +1950,21 @@ func validateAgentChatModels(ctx context.Context, userID, tenantID string, dsl mif !strings.EqualFold(node.Obj.ComponentName, "Agent") {continue}+ for _, field := range []string{"model_id", "llm_id"} {+ if value := node.Obj.Params[field]; value != nil {+ if _, ok := value.(string); !ok {+ return fmt.Errorf("Agent %s must be a string", field)+ }+ }+ }modelRef, ok := node.Obj.Params["model_id"].(string)if !ok {modelRef, _ = node.Obj.Params["llm_id"].(string)}if _, err := modelFactory.ResolveInfo(ctx, ModelAccess{UserID: userID, TenantID: tenantID}, entity.ModelTypeChat, modelRef); err != nil {+ if draft && (errors.Is(err, errModelConfigUnavailable) || errors.Is(err, gorm.ErrRecordNotFound)) && !errors.Is(err, permission.ErrPermissionDenied) && !errors.Is(err, permission.ErrResourceNotFound) {+ continue+ }if errors.Is(err, errModelConfigUnavailable) || errors.Is(err, gorm.ErrRecordNotFound) {return errors.New("The configured chat model is missing or unavailable. Please select a valid model.")}diff --git a/internal/service/model_factory.go b/internal/service/model_factory.goindex 2a96c105a7..7899f15b48 100644--- a/internal/service/model_factory.go+++ b/internal/service/model_factory.go@@ -652,9 +652,6 @@ func (s *ModelFactory) modelIdentity(ctx context.Context, tenantID, userID strinif modelEntity == nil {return nil, fmt.Errorf("%w: tenant model %q not found", errModelConfigUnavailable, modelRef)}- if !strings.EqualFold(modelEntity.Status, "active") {- return nil, fmt.Errorf("%w: tenant model %q is disabled", errModelConfigUnavailable, modelRef)- }modelType := entity.ModelType(modelEntity.ModelType)if modelType == 0 {@@ -704,6 +701,9 @@ func (s *ModelFactory) modelIdentity(ctx context.Context, tenantID, userID strinreturn nil, fmt.Errorf("%w: user %s cannot use model instance %q: %w", errModelConfigUnavailable, userID, instanceEntity.InstanceName, err)}}+ if !strings.EqualFold(modelEntity.Status, "active") {+ return nil, fmt.Errorf("%w: tenant model %q is disabled", errModelConfigUnavailable, modelRef)+ }if !strings.EqualFold(instanceEntity.Status, "active") {return nil, fmt.Errorf("%w: model instance %q is disabled", errModelConfigUnavailable, instanceEntity.InstanceName)}@@ -864,14 +864,14 @@ func (s *ModelFactory) resolveProviderInstanceModel(ctx context.Context, accessif instance == nil {return nil, fmt.Errorf("%w: instance %q not found for model %q", errModelConfigUnavailable, instanceName, modelRef)}- if !strings.EqualFold(instance.Status, "active") {- return nil, fmt.Errorf("%w: model instance %q is disabled", errModelConfigUnavailable, instanceName)- }if access.UserID != "" {if err = checkModelPermission(ctx, access.UserID, permission.ResourceKindModelInstance, instance.ID, permission.OperationUse); err != nil {return nil, fmt.Errorf("%w: user %s cannot use model instance %q: %w", errModelConfigUnavailable, access.UserID, instanceName, err)}}+ if !strings.EqualFold(instance.Status, "active") {+ return nil, fmt.Errorf("%w: model instance %q is disabled", errModelConfigUnavailable, instanceName)+ }extra, err := decodeModelInstanceExtra(instance.Extra)if err != nil {return nil, fmt.Errorf("%w: decode model instance configuration: %v", errModelConfigUnavailable, err)diff --git a/internal/service/model_service.go b/internal/service/model_service.goindex e9786f54f4..a40c408505 100644--- a/internal/service/model_service.go+++ b/internal/service/model_service.go@@ -1648,16 +1648,18 @@ func (m *ModelProviderService) ListTenantAddedModels(ctx context.Context, userIDrank = 500}added = append(added, map[string]interface{}{- "model_id": modelRecord.ID,- "tenant_id": provInfo.TenantID,- "tenant_name": tenantName,- "model_type": entity.ModelType(modelRecord.ModelType).HumanReadable(),- "name": modelRecord.ModelName,- "provider_id": modelRecord.ProviderID,- "provider_name": provInfo.ProviderName,- "instance_id": modelRecord.InstanceID,- "instance_name": instInfo.InstanceName,- "rank": rank,+ "model_id": modelRecord.ID,+ "status": modelRecord.Status,+ "instance_status": instInfo.Status,+ "tenant_id": provInfo.TenantID,+ "tenant_name": tenantName,+ "model_type": entity.ModelType(modelRecord.ModelType).HumanReadable(),+ "name": modelRecord.ModelName,+ "provider_id": modelRecord.ProviderID,+ "provider_name": provInfo.ProviderName,+ "instance_id": modelRecord.InstanceID,+ "instance_name": instInfo.InstanceName,+ "rank": rank,})}diff --git a/web/src/hooks/use-llm-request.tsx b/web/src/hooks/use-llm-request.tsxindex 3ccde50bc0..381dc8b086 100644--- a/web/src/hooks/use-llm-request.tsx+++ b/web/src/hooks/use-llm-request.tsx@@ -127,6 +127,7 @@ export const useFetchAllAddedModels = (const {data,isFetching: loading,+ refetch,isFetched,isError,} = useQuery<IAddedModel[]>({@@ -150,7 +151,7 @@ export const useFetchAllAddedModels = (// `data` is seeded with `initialData: []`, so it can't tell a real empty// result apart from "fetch hasn't completed yet" — `isFetched` stays false// until a genuine response (or error) arrives.- return { data, loading, isFetched, isError };+ return { data, loading, isFetched, isError, refetch };};/**@@ -164,14 +165,22 @@ export const useModelValidIds = (modelTypes: string[],ownerTenantId?: string,) => {- const { data, isFetched } = useFetchAllAddedModels(undefined, ownerTenantId);-+ const { data, isFetched, refetch } = useFetchAllAddedModels(+ undefined,+ ownerTenantId,+ );const validIds = useMemo(() => buildValidModelIds(data, modelTypes),[data, modelTypes],);- return { validIds, isFetched };+ const resolveValidIds = async () => {+ const result = await refetch();+ if (result.isError) throw result.error;+ return buildValidModelIds(result.data ?? [], modelTypes);+ };++ return { validIds, isFetched, resolveValidIds };};export function useFindLlmByUuid() {diff --git a/web/src/interfaces/database/llm.ts b/web/src/interfaces/database/llm.tsindex 0ca2dab9f6..0d487666a7 100644--- a/web/src/interfaces/database/llm.ts+++ b/web/src/interfaces/database/llm.ts@@ -85,6 +85,8 @@ export interface IProviderInstance {}export interface IAddedModel {model_id: string;+ status?: string;+ instance_status?: string;model_type: string[];name: string;provider_id: string;diff --git a/web/src/pages/agent/hooks/use-run-preflight.test.ts b/web/src/pages/agent/hooks/use-run-preflight.test.tsindex 38890d69df..59ea3291bd 100644--- a/web/src/pages/agent/hooks/use-run-preflight.test.ts+++ b/web/src/pages/agent/hooks/use-run-preflight.test.ts@@ -11,6 +11,14 @@ const mockSetAgent = jest.fn();const mockResetAgent = jest.fn();const mockBuildDslData = jest.fn();+const mockResolveValidIds = jest.fn().mockResolvedValue(new Set(['model']));+jest.mock('@/hooks/use-llm-request', () => ({+ useModelValidIds: () => ({ resolveValidIds: mockResolveValidIds }),+}));+jest.mock('@/components/model-tree-select', () => ({+ ModelTypeMap: { llm_id: ['chat'] },+}));+jest.mock('@/hooks/use-agent-request', () => ({useFetchAgent: () => ({ data: { title: 'Draft' } }),useSetAgent: () => ({ setAgent: mockSetAgent, loading: false }),diff --git a/web/src/pages/agent/hooks/use-save-graph.ts b/web/src/pages/agent/hooks/use-save-graph.tsindex 5678f9c6eb..2443ce67ca 100644--- a/web/src/pages/agent/hooks/use-save-graph.ts+++ b/web/src/pages/agent/hooks/use-save-graph.ts@@ -1,4 +1,7 @@import message from '@/components/ui/message';+import { ModelTypeMap } from '@/components/model-tree-select';+import { useModelValidIds } from '@/hooks/use-llm-request';+import { Operator } from '../constant';import {useFetchAgent,useResetAgent,@@ -60,15 +63,35 @@ export const useSaveGraph = (export const useSaveGraphBeforeOpeningDebugDrawer = (show: () => void) => {const { saveGraph, loading } = useSaveGraph();const { resetAgent } = useResetAgent();+ const { data: agent } = useFetchAgent();+ const { resolveValidIds } = useModelValidIds(+ ModelTypeMap.llm_id,+ agent?.tenant_id,+ );const handleRun = useCallback(async (nextNodes?: RAGFlowNodeType[]) => {const { nodes, edges, editedNodeFormIds } = useGraphStore.getState();- const issue = collectCanvasIssues({+ const inputs = { nodes: nextNodes ?? nodes, edges, editedNodeFormIds };+ let issue = collectCanvasIssues({nodes: nextNodes ?? nodes,edges,editedNodeFormIds,}).find((issue) => issue.blocksRun);+ if (+ !issue &&+ inputs.nodes.some((node) => node.data?.label === Operator.Agent)+ ) {+ try {+ const modelValidIds = await resolveValidIds();+ issue = collectCanvasIssues({ ...inputs, modelValidIds }).find(+ (issue) => issue.blocksRun,+ );+ } catch {+ message.error(i18n.t('common.modelUnavailable'));+ return;+ }+ }if (issue) {message.error(`${issue.nodeName}: ${i18n.t(issue.messageKey, issue.messageParams)}`,@@ -85,7 +108,7 @@ export const useSaveGraphBeforeOpeningDebugDrawer = (show: () => void) => {}}},- [saveGraph, resetAgent, show],+ [saveGraph, resetAgent, show, resolveValidIds],);return { handleRun, loading };diff --git a/web/src/pages/agent/utils/canvas-checklist.ts b/web/src/pages/agent/utils/canvas-checklist.tsindex d287a27707..99576170a2 100644--- a/web/src/pages/agent/utils/canvas-checklist.ts+++ b/web/src/pages/agent/utils/canvas-checklist.ts@@ -719,11 +719,13 @@ export function collectCanvasIssues({}// Not gated on editedNodeFormIds: a canvas loaded from storage with an// empty model must flag on the very next render, not only after edits.- if (!form?.llm_id) {+ const modelRef = form?.model_id ?? form?.llm_id;+ if (typeof modelRef !== 'string' || !modelRef.trim()) {issues.push({...target,type: CanvasIssueType.MissingRequired,messageKey: 'flow.agentModelMissing',+ blocksRun: true,});}if (Array.isArray(form?.tools)) {@@ -878,14 +880,15 @@ export function collectCanvasIssues({if (modelValidIds &&- typeof form?.llm_id === 'string' &&- form.llm_id &&- !modelValidIds.has(form.llm_id)+ typeof (form?.model_id ?? form?.llm_id) === 'string' &&+ (form?.model_id ?? form?.llm_id) &&+ !modelValidIds.has(form?.model_id ?? form?.llm_id)) {issues.push({...target,type: CanvasIssueType.InvalidVariable,messageKey: 'common.modelUnavailable',+ blocksRun: label === Operator.Agent,});}diff --git a/web/src/utils/llm-util.ts b/web/src/utils/llm-util.tsindex a9495b7ed4..2afd6cf85a 100644--- a/web/src/utils/llm-util.ts+++ b/web/src/utils/llm-util.ts@@ -82,6 +82,11 @@ export function buildValidModelIds(): Set<string> {const ids = new Set<string>();for (const m of allModels) {+ if (+ (m.status != null && m.status !== 'active') ||+ (m.instance_status != null && m.instance_status !== 'active')+ )+ continue;if (!m.model_type?.some((t) => modelTypes.includes(t))) continue;const legacyId = buildModelValue({model_name: getRealModelName(m.name),