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(api): mark unavailable legacy DSL agent assets as missing (#42622)

林玮 (Jade Lin)99df0ca07f54
diff --git a/api/services/agent/dsl_service.py b/api/services/agent/dsl_service.py
index d5d31d63467..1378cdf7976 100644
--- a/api/services/agent/dsl_service.py
+++ b/api/services/agent/dsl_service.py
@@ -41,6 +41,7 @@ from models.agent import (
from models.agent_config_entities import AgentSoulConfig, WorkflowNodeJobConfig
from models.model import App, AppModelConfig, UploadFile
from models.skill import AgentSkillBinding, AgentSkillBindingSnapshot, Skill
+from models.tools import ToolFile
from models.workflow import Workflow
from services.agent.agent_soul_state import agent_soul_has_model
from services.agent.dependency_service import extract_agent_soul_dependencies
@@ -624,6 +625,9 @@ class AgentDslService:
)
for asset in package.omitted_assets
]
+ warnings.extend(
+ self._mark_missing_package_assets(tenant_id=tenant_id, soul_data=soul_data, package_path=package_path)
+ )
for tool_index, tool in enumerate(package.soul.tools.dify_tools):
tool_label = tool.tool_name or tool.provider or tool.provider_id
warnings.append(
@@ -676,6 +680,51 @@ class AgentDslService:
)
return AgentSoulConfig.model_validate(soul_data), warnings
+ def _mark_missing_package_assets(
+ self,
+ *,
+ tenant_id: str,
+ soul_data: dict[str, Any],
+ package_path: str,
+ ) -> list[DslImportWarning]:
+ """Mark unavailable asset references in place and return import warnings."""
+ warnings: list[DslImportWarning] = []
+ # Legacy DSLs can retain source-workspace ids without an is_missing flag.
+ # Check local records so resources materialized from archives remain usable.
+ asset_refs = [
+ (kind, index, item)
+ for kind, field in (("skill", "config_skills"), ("file", "config_files"))
+ for index, item in enumerate(soul_data[field])
+ if not item["is_missing"]
+ ]
+ for file_kind, model in (("tool_file", ToolFile), ("upload_file", UploadFile)):
+ refs = [(kind, index, item) for kind, index, item in asset_refs if item["file_kind"] == file_kind]
+ valid_ids: set[str] = set()
+ for _, _, item in refs:
+ try:
+ valid_ids.add(str(UUID(item["file_id"])))
+ except ValueError:
+ continue
+ existing_ids = (
+ set(self.session.scalars(select(model.id).where(model.tenant_id == tenant_id, model.id.in_(valid_ids))))
+ if valid_ids
+ else set()
+ )
+ for kind, index, item in refs:
+ if item["file_id"] in existing_ids:
+ continue
+ item["file_id"] = ""
+ item["is_missing"] = True
+ warnings.append(
+ DslImportWarning(
+ code=f"agent_{kind}_missing",
+ path=f"{package_path}.soul.config_{'skills' if kind == 'skill' else 'files'}.{index}",
+ message=f"Agent {kind} {item['name']!r} is unavailable in the target workspace.",
+ details={"kind": kind, "name": item["name"]},
+ )
+ )
+ return warnings
+
def _create_snapshot(
self,
*,
diff --git a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
index 8dd0754f460..cc1668d0a43 100644
--- a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
+++ b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
@@ -1,5 +1,6 @@
import json
from unittest.mock import Mock
+from uuid import uuid4
import pytest
from pydantic import ValidationError
@@ -26,6 +27,7 @@ from models.agent_config_entities import AgentConfigFileRefConfig, AgentConfigSk
from models.dataset import Dataset
from models.enums import AppStatus
from models.model import App, AppMode
+from models.tools import ToolFile
from models.workflow import Workflow, WorkflowType
from services.agent.dsl_entities import (
AGENT_NODE_JOB_DSL_KEY,
@@ -36,6 +38,7 @@ from services.agent.dsl_entities import (
)
from services.agent.dsl_service import AgentDslService, AgentPackageImportResult, is_agent_v2_graph
from services.entities.dsl_entities import DslImportWarning
+from tests.unit_tests.model_factories import make_upload_file
def _agent(
@@ -906,6 +909,56 @@ def test_resolve_package_soul_preserves_existing_and_marks_missing_knowledge(
}
+ ("field", "file_kind"),
+ [("config_skills", "tool_file"), ("config_files", "tool_file"), ("config_files", "upload_file")],
+)
[email protected]("availability", ["local", "foreign", "deleted", "invalid_id"])
+def test_resolve_legacy_package_asset_references(
+ sqlite_session: Session, field: str, file_kind: str, availability: str
+) -> None:
+ tenant_id = "tenant-2" if availability == "foreign" else "tenant-1"
+ file_id = "legacy-file-id" if availability == "invalid_id" else str(uuid4())
+ if availability in {"local", "foreign"}:
+ if file_kind == "upload_file":
+ row = make_upload_file(file_id=file_id, tenant_id=tenant_id)
+ else:
+ row = ToolFile(
+ tenant_id=tenant_id,
+ user_id="account-1",
+ conversation_id=None,
+ file_key="tools/asset.zip",
+ mimetype="application/zip",
+ )
+ row.id = file_id
+ sqlite_session.add(row)
+ sqlite_session.flush()
+ package = AgentPackage.model_validate(
+ {
+ "metadata": {"name": "Legacy Agent"},
+ "soul": {field: [{"name": "asset", "file_kind": file_kind, "file_id": file_id, "size": 42}]},
+ }
+ )
+
+ resolved, warnings = AgentDslService(sqlite_session).resolve_package_soul(
+ tenant_id="tenant-1", package=package, package_path="agent_packages.agent_1"
+ )
+
+ ref = (resolved.config_skills if field == "config_skills" else resolved.config_files)[0]
+ assert ref.is_missing is (availability != "local")
+ assert ref.file_id == (file_id if availability == "local" else "")
+ assert ref.name == "asset"
+ assert ref.size == 42
+ original_ref = (package.soul.config_skills if field == "config_skills" else package.soul.config_files)[0]
+ assert original_ref.file_id == file_id
+ if availability == "local":
+ assert warnings == []
+ else:
+ kind = "skill" if field == "config_skills" else "file"
+ assert [warning.code for warning in warnings] == [f"agent_{kind}_missing"]
+ assert warnings[0].path == f"agent_packages.agent_1.soul.{field}.0"
+
+
def test_create_snapshot_increments_version_and_records_revision(sqlite_session: Session) -> None:
agent = _agent()
sqlite_session.add_all(