Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(agent): validate workspace skill references on publish (#42299)

Xx.Zhao6a0039812d9e
diff --git a/api/services/agent/workflow_publish_service.py b/api/services/agent/workflow_publish_service.py
index 55778f015c1..d5075714c61 100644
--- a/api/services/agent/workflow_publish_service.py
+++ b/api/services/agent/workflow_publish_service.py
@@ -184,21 +184,42 @@ class WorkflowAgentPublishService:
node_job=node_job,
)
ComposerConfigValidator.validate_publish_payload(payload)
- cls._require_config_asset_refs_resolved_for_publish(binding=binding, agent_soul=agent_soul)
+ cls._require_config_asset_refs_resolved_for_publish(
+ session=session,
+ binding=binding,
+ snapshot_id=snapshot_id,
+ agent_soul=agent_soul,
+ )
@classmethod
def _require_config_asset_refs_resolved_for_publish(
cls,
*,
+ session: Session,
binding: WorkflowAgentNodeBinding,
+ snapshot_id: str,
agent_soul: AgentSoulConfig,
) -> None:
from services.agent.prompt_mentions import MentionKind, parse_prompt_mentions
+ from services.skill_management_service import SkillManagementService
+ mentions = parse_prompt_mentions(agent_soul.prompt.system_prompt)
configured_skill_names = {item.name for item in agent_soul.config_skills if not item.is_missing}
+ has_unresolved_skill_ref = any(
+ mention.kind == MentionKind.SKILL and mention.ref_id not in configured_skill_names for mention in mentions
+ )
+ if has_unresolved_skill_ref and binding.agent_id is not None:
+ configured_skill_names.update(
+ str(item["name"])
+ for item in SkillManagementService(session=session).list_runtime_agent_skills(
+ tenant_id=binding.tenant_id,
+ agent_id=binding.agent_id,
+ config_snapshot_id=snapshot_id,
+ )
+ )
configured_file_names = {item.name for item in agent_soul.config_files if not item.is_missing}
missing_refs: list[str] = []
- for mention in parse_prompt_mentions(agent_soul.prompt.system_prompt):
+ for mention in mentions:
if mention.kind not in {MentionKind.SKILL, MentionKind.FILE}:
continue
ref_name = mention.ref_id
diff --git a/api/services/skill_management_service.py b/api/services/skill_management_service.py
index b3bd3546add..cb2df162927 100644
--- a/api/services/skill_management_service.py
+++ b/api/services/skill_management_service.py
@@ -2265,8 +2265,9 @@ class SkillManagementService:
tenant_id: str,
agent_id: str,
include_draft: bool = False,
+ config_snapshot_id: str | None = None,
) -> list[dict[str, Any]]:
- """Return workspace Skills from the Agent draft or active published snapshot."""
+ """Return workspace Skills from the Agent draft or a published snapshot."""
with self._session_scope() as session:
binding_model = AgentSkillBinding if include_draft else AgentSkillBindingSnapshot
conditions = [
@@ -2276,7 +2277,10 @@ class SkillManagementService:
Agent.tenant_id == tenant_id,
]
if not include_draft:
- conditions.append(AgentSkillBindingSnapshot.config_snapshot_id == Agent.active_config_snapshot_id)
+ if config_snapshot_id is None:
+ conditions.append(AgentSkillBindingSnapshot.config_snapshot_id == Agent.active_config_snapshot_id)
+ else:
+ conditions.append(AgentSkillBindingSnapshot.config_snapshot_id == config_snapshot_id)
rows = list(
session.execute(
select(binding_model, Skill, SkillVersion)
diff --git a/api/tests/unit_tests/services/agent/test_agent_services.py b/api/tests/unit_tests/services/agent/test_agent_services.py
index 0a0ebc4ea08..90435a5ef12 100644
--- a/api/tests/unit_tests/services/agent/test_agent_services.py
+++ b/api/tests/unit_tests/services/agent/test_agent_services.py
@@ -39,6 +39,7 @@ from models.agent_config_entities import (
)
from models.enums import AppStatus, ConversationFromSource, ConversationStatus
from models.model import App, AppMode, AppModelConfig, Conversation, IconType, Message
+from models.skill import AgentSkillBindingSnapshot, Skill, SkillVersion, SkillVersionManifest
from models.workflow import Workflow, WorkflowType
from services.agent import composer_service, roster_service
from services.agent.agent_soul_state import agent_soul_has_model
@@ -5551,6 +5552,65 @@ class TestWorkflowAgentDraftBindingSync:
draft_workflow=self._agent_workflow(),
)
+ def test_publish_validation_keeps_workspace_skill_refs_when_config_files_are_present(self, sqlite_session: Session):
+ session = sqlite_session
+ binding = self._agent_binding()
+ agent_soul = AgentSoulConfig.model_validate(
+ {
+ "model": {
+ "plugin_id": "langgenius/openai/openai",
+ "model_provider": "openai",
+ "model": "gpt-4o",
+ },
+ "prompt": {"system_prompt": "Use [§skill:research:Research§] and [§file:guide.md:Guide§]."},
+ "config_files": [
+ {
+ "name": "guide.md",
+ "file_kind": "upload_file",
+ "file_id": "file-1",
+ }
+ ],
+ }
+ )
+ agent = self._publish_agent()
+ snapshot = self._snapshot(agent_soul)
+ skill = Skill(
+ id="skill-1",
+ tenant_id="tenant-1",
+ name="research",
+ display_name="Research",
+ latest_published_version_id="skill-version-1",
+ )
+ skill_version = SkillVersion(
+ id="skill-version-1",
+ skill_id="skill-1",
+ version_number=1,
+ manifest=SkillVersionManifest(
+ files=[],
+ name="research",
+ display_name="Research",
+ description="",
+ ),
+ archive_tool_file_id="archive-1",
+ hash_code="hash-1",
+ archive_size=1,
+ )
+ skill_binding = AgentSkillBindingSnapshot(
+ id="skill-binding-1",
+ tenant_id="tenant-1",
+ agent_id="agent-1",
+ config_snapshot_id="snapshot-1",
+ skill_id="skill-1",
+ priority=0,
+ )
+ session.add_all([binding, agent, snapshot, skill, skill_version, skill_binding])
+ session.commit()
+
+ WorkflowAgentPublishService.validate_agent_nodes_for_publish(
+ session=session,
+ draft_workflow=self._agent_workflow(),
+ )
+
def test_publish_validation_rejects_dangling_agent_soul_config_refs(self, sqlite_session: Session):
session = sqlite_session
binding = self._agent_binding()