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.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(agent): require paid plan for version restore (#42551)
林玮 (Jade Lin)b53e5f23c6b9
diff --git a/api/controllers/console/agent/roster.py b/api/controllers/console/agent/roster.pyindex f73dfafa557..86de45b8bcb 100644--- a/api/controllers/console/agent/roster.py+++ b/api/controllers/console/agent/roster.py@@ -48,6 +48,7 @@ from controllers.console.wraps import (with_current_user,)from core.agent.publish_visibility import agent_has_workflow_callable_active_snapshot+from enums import DeploymentEditionfrom fields.agent_fields import (AgentConfigDraftSummaryResponse,AgentConfigSnapshotDetailResponse,@@ -83,6 +84,7 @@ from services.app_service import AgentAppPublicationCounts, AppListParams, AppSefrom services.enterprise import rbac_service as enterprise_rbac_servicefrom services.enterprise.enterprise_service import EnterpriseServicefrom services.entities.agent_entities import ComposerSavePayload, RosterListQuery+from services.feature_service import FeatureServicefrom services.system_feature_service import SystemFeatureServiceAgentPublicationStatus = Literal["published", "drafts"]@@ -1311,6 +1313,12 @@ class AgentRosterVersionRestoreApi(Resource):@with_current_tenant_id@with_sessiondef post(self, session: Session, tenant_id: str, current_user: Account, agent_id: UUID, version_id: UUID):+ if (+ dify_config.DEPLOYMENT_EDITION == DeploymentEdition.CLOUD+ and not FeatureService.get_workspace_plan(tenant_id).is_paid+ ):+ abort(403, description="This feature requires a paid plan.")+return dump_response(AgentConfigSnapshotRestoreResponse,_agent_roster_service(session).restore_agent_version(diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.pyindex d2af3b5fddc..940a06eebeb 100644--- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py+++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py@@ -7,7 +7,7 @@ from unittest.mock import MagicMock, Mock, callimport pytestfrom flask import Flaskfrom sqlalchemy.orm import Session-from werkzeug.exceptions import InternalServerError, NotFound+from werkzeug.exceptions import Forbidden, InternalServerError, NotFoundfrom controllers.console import console_nsfrom controllers.console.agent import composer as composer_controller@@ -63,6 +63,7 @@ from controllers.console.app.message import (AgentMessageSuggestedQuestionApi,)from core.app.entities.app_invoke_entities import InvokeFrom+from enums import CloudPlan, DeploymentEditionfrom models.account import Account, TenantAccountRolefrom models.agent import Agent, AgentConfigDraftType, AgentScope, AgentSource, AgentStatusfrom models.enums import ApiTokenType, ConversationFromSource@@ -1173,9 +1174,12 @@ def test_invite_options_get_applies_resource_visibility(assert captured["accessible_agent_ids"] == ["agent-1", "agent-2"]-def test_agent_versions_call_services(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:+def test_agent_version_queries_do_not_require_paid_plan(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:agent_id = "00000000-0000-0000-0000-000000000001"version_id = "00000000-0000-0000-0000-000000000002"+ apply_config_overrides(monkeypatch, DEPLOYMENT_EDITION=DeploymentEdition.CLOUD)+ get_plan = Mock(return_value=CloudPlan.SANDBOX)+ monkeypatch.setattr(roster_controller.FeatureService, "get_workspace_plan", get_plan)monkeypatch.setattr(roster_controller.AgentRosterService, "list_agent_versions", lambda _self, **kwargs: [_version_response()])@@ -1201,13 +1205,6 @@ def test_agent_versions_call_services(app: Flask, monkeypatch: pytest.MonkeyPatc],},)- captured_restore: dict[str, object] = {}-- def restore_agent_version(_self, **kwargs):- captured_restore.update(kwargs)- return {"result": "success", "active_config_snapshot_id": kwargs["version_id"]}-- monkeypatch.setattr(roster_controller.AgentRosterService, "restore_agent_version", restore_agent_version)assert (unwrap(AgentRosterVersionsApi.get)(AgentRosterVersionsApi(), MagicMock(), "tenant-1", agent_id)["data"][0]["id"]== "version-1"@@ -1217,21 +1214,60 @@ def test_agent_versions_call_services(app: Flask, monkeypatch: pytest.MonkeyPatc)assert version_detail["id"] == version_idassert version_detail["agent_id"] == agent_id- restored = unwrap(AgentRosterVersionRestoreApi.post)(- AgentRosterVersionRestoreApi(), MagicMock(), "tenant-1", _account(), agent_id, version_id- )- assert restored == {- "result": "success",- "active_config_snapshot_id": version_id,- "draft_config_id": None,- "restored_version_id": None,- }- assert captured_restore == {- "tenant_id": "tenant-1",- "agent_id": agent_id,- "version_id": version_id,- "account_id": "account-1",- }+ get_plan.assert_not_called()+++ ("edition", "plan", "allowed"),+ [+ (DeploymentEdition.CLOUD, CloudPlan.SANDBOX, False),+ (DeploymentEdition.CLOUD, CloudPlan.PROFESSIONAL, True),+ (DeploymentEdition.CLOUD, CloudPlan.TEAM, True),+ (DeploymentEdition.COMMUNITY, CloudPlan.SANDBOX, True),+ (DeploymentEdition.ENTERPRISE, CloudPlan.SANDBOX, True),+ ],+)+def test_agent_version_restore_requires_cloud_paid_plan(+ monkeypatch: pytest.MonkeyPatch,+ edition: DeploymentEdition,+ plan: CloudPlan,+ allowed: bool,+) -> None:+ agent_id = "00000000-0000-0000-0000-000000000001"+ version_id = "00000000-0000-0000-0000-000000000002"+ apply_config_overrides(monkeypatch, DEPLOYMENT_EDITION=edition)+ get_plan = Mock(return_value=plan)+ monkeypatch.setattr(roster_controller.FeatureService, "get_workspace_plan", get_plan)+ restore = Mock(return_value={"result": "success", "active_config_snapshot_id": version_id})+ monkeypatch.setattr(roster_controller.AgentRosterService, "restore_agent_version", restore)+ session = MagicMock(spec=Session)+ api = AgentRosterVersionRestoreApi()++ if not allowed:+ with pytest.raises(Forbidden, match="This feature requires a paid plan.") as exc_info:+ unwrap(api.post)(api, session, "tenant-1", _account(), agent_id, version_id)+ assert exc_info.value.code == 403+ restore.assert_not_called()+ assert session.mock_calls == []+ else:+ restored = unwrap(api.post)(api, session, "tenant-1", _account(), agent_id, version_id)+ assert restored == {+ "result": "success",+ "active_config_snapshot_id": version_id,+ "draft_config_id": None,+ "restored_version_id": None,+ }+ restore.assert_called_once_with(+ tenant_id="tenant-1",+ agent_id=agent_id,+ version_id=version_id,+ account_id="account-1",+ )++ if edition == DeploymentEdition.CLOUD:+ get_plan.assert_called_once_with("tenant-1")+ else:+ get_plan.assert_not_called()def test_agent_observability_routes_resolve_app_from_agent_id(