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.

chore(api): retire New Agent Beta campaign integration (#43918)

非法操作8b4f32fc9586
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index f3eabbafcb9..99818967812 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -1372,17 +1372,6 @@ class MultiModalTransferConfig(BaseSettings):
)
-class NewAgentBetaConfig(BaseSettings):
- NEW_AGENT_BETA_ACTIVITY_START_AT: datetime | None = Field(
- description="New Agent Beta Publish window start in RFC3339 UTC (inclusive)",
- default=None,
- )
- NEW_AGENT_BETA_ACTIVITY_END_AT: datetime | None = Field(
- description="New Agent Beta Publish window end in RFC3339 UTC (exclusive)",
- default=None,
- )
-
-
class OpsTraceConfig(BaseSettings):
OPS_TRACE_UNIFIED_ENABLED: bool = Field(
description="Enable unified ops tracing for providers registered in the unified registry.",
@@ -1725,7 +1714,6 @@ class FeatureConfig(
ModelLoadBalanceConfig,
ModerationConfig,
MultiModalTransferConfig,
- NewAgentBetaConfig,
OpsTraceConfig,
PositionConfig,
RagEtlConfig,
diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index 9f7096197d1..7befa412af2 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -180,7 +180,6 @@ def init_app(app: DifyApp) -> Celery:
"tasks.rag_pipeline.priority_rag_pipeline_run_task", # priority RAG pipeline execution
"tasks.initialize_created_app_rbac_access_task", # app access initialization
"tasks.install_default_plugins_task", # tenant default plugin installation
- "tasks.new_agent_beta_task", # New Agent Beta eligibility checks
"tasks.refresh_billing_vector_space_task", # billing vector-space cache refresh
"tasks.workflow_run_archive_download_tasks", # workflow-run archive download preparation
]
diff --git a/api/services/agent/composer_service.py b/api/services/agent/composer_service.py
index 7787e0524dd..d56bf52073a 100644
--- a/api/services/agent/composer_service.py
+++ b/api/services/agent/composer_service.py
@@ -67,7 +67,6 @@ from services.entities.agent_entities import (
)
from services.skill_management_service import SkillManagementService
from tasks.collect_agent_resources_task import enqueue_agent_resource_collection
-from tasks.new_agent_beta_task import register_new_agent_beta_publish_after_commit
# WorkflowAgentNodeBinding.workflow_version tag for the draft workflow row.
# Mirrors Workflow.version when it is "draft" (see models/workflow.py).
@@ -734,12 +733,6 @@ class AgentComposerService:
app.enable_api = True
app.updated_by = account_id
session.flush()
- register_new_agent_beta_publish_after_commit(
- session=session,
- tenant_id=tenant_id,
- agent_id=agent.id,
- snapshot_id=version.id,
- )
return {
"result": "success",
"publication_kind": "update" if access_was_ready else "first",
diff --git a/api/services/agent/workflow_publish_service.py b/api/services/agent/workflow_publish_service.py
index 358b49e80a1..d3b01e3efbe 100644
--- a/api/services/agent/workflow_publish_service.py
+++ b/api/services/agent/workflow_publish_service.py
@@ -601,19 +601,18 @@ class WorkflowAgentPublishService:
session: Session,
draft_workflow: Workflow,
published_workflow: Workflow,
- ) -> bool:
+ ) -> None:
"""Copy all draft Roster and inline bindings to a published version.
Only copied inline bindings add owners for workflow-only Agents.
Publishing does not release existing draft or historical inline owners,
- produces no retirement candidates. The return value reports whether
- the published Workflow contains an inline Agent binding.
+ produces no retirement candidates.
"""
node_ids = {
node_id for node_id, _node_data in WorkflowAgentNodeValidator.iter_agent_v2_nodes(draft_workflow.graph_dict)
}
if not node_ids:
- return False
+ return
bindings = session.scalars(
select(WorkflowAgentNodeBinding).where(
@@ -625,15 +624,9 @@ class WorkflowAgentPublishService:
)
).all()
if not bindings:
- return False
+ return
- has_inline_agent = False
for binding in bindings:
- has_inline_agent = has_inline_agent or (
- binding.binding_type == WorkflowAgentBindingType.INLINE_AGENT
- and binding.agent_id is not None
- and binding.current_snapshot_id is not None
- )
current_snapshot_id = binding.current_snapshot_id
if binding.binding_type == WorkflowAgentBindingType.ROSTER_AGENT and binding.agent_id:
_, current_snapshot_id = cls._resolve_roster_agent_graph_binding(
@@ -656,7 +649,6 @@ class WorkflowAgentPublishService:
updated_by=binding.updated_by,
)
session.add(copied)
- return has_inline_agent
@classmethod
def restore_agent_node_bindings_to_draft(
diff --git a/api/services/billing_service.py b/api/services/billing_service.py
index 7d607b11fb9..afdd2ebb5df 100644
--- a/api/services/billing_service.py
+++ b/api/services/billing_service.py
@@ -225,14 +225,6 @@ class BillingService:
# Cache TTL: 10 minutes
_PLAN_CACHE_TTL = 600
- @classmethod
- def ensure_new_agent_beta_revision(cls, revision_id: str) -> None:
- cls._send_request("POST", f"/new-agent-beta/revisions/{revision_id}/ensure")
-
- @classmethod
- def ensure_new_agent_beta_workflow(cls, workflow_id: str) -> None:
- cls._send_request("POST", f"/new-agent-beta/workflows/{workflow_id}/ensure")
-
@classmethod
def get_info(cls, tenant_id: str, exclude_vector_space: bool = False) -> BillingInfo:
params = {"tenant_id": tenant_id}
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index d50ecd80c71..cd96e60caae 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -95,7 +95,6 @@ from services.errors.app import (
WorkflowNotFoundError,
)
from services.system_feature_service import SystemFeatureService
-from tasks.new_agent_beta_task import register_new_agent_beta_workflow_publish_after_commit
@dataclass(frozen=True)
@@ -748,17 +747,11 @@ class WorkflowService:
# commit db session changes
session.add(workflow)
- has_inline_agent = WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
+ WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
session=session,
draft_workflow=draft_workflow,
published_workflow=workflow,
)
- if has_inline_agent:
- register_new_agent_beta_workflow_publish_after_commit(
- session=session,
- published_workflow_id=workflow.id,
- published_at=workflow.created_at,
- )
# trigger app workflow events
app_published_workflow_was_updated.send(app_model, published_workflow=workflow)
diff --git a/api/tasks/new_agent_beta_task.py b/api/tasks/new_agent_beta_task.py
deleted file mode 100644
index b0b3f57bcf3..00000000000
--- a/api/tasks/new_agent_beta_task.py
+++ /dev/null
@@ -1,164 +0,0 @@
-import logging
-from datetime import UTC, datetime
-
-from celery import shared_task
-from sqlalchemy import event, select
-from sqlalchemy.orm import Session
-
-from configs import dify_config
-from enums import DeploymentEdition
-from models.agent import AgentConfigRevision, AgentConfigRevisionOperation
-from services.billing_service import BillingService
-
-logger = logging.getLogger(__name__)
-
-_MAX_RETRIES = 8
-_RETRY_DELAY_SECONDS = 30
-_MAX_RETRY_DELAY_SECONDS = 900
-NEW_AGENT_BETA_QUEUE = "new_agent_beta"
-
-
-def _is_publish_in_activity_window(published_at: datetime) -> bool:
- start = dify_config.NEW_AGENT_BETA_ACTIVITY_START_AT
- end = dify_config.NEW_AGENT_BETA_ACTIVITY_END_AT
- if start is None or end is None or start.tzinfo is None or end.tzinfo is None or start >= end:
- logger.error("New Agent Beta Publish window must be a valid RFC3339 interval")
- return False
- if published_at.tzinfo is None:
- published_at = published_at.replace(tzinfo=UTC)
- else:
- published_at = published_at.astimezone(UTC)
- return start.astimezone(UTC) <= published_at < end.astimezone(UTC)
-
-
-def register_new_agent_beta_publish_after_commit(
- *, session: Session, tenant_id: str, agent_id: str, snapshot_id: str
-) -> None:
- """Best-effort registration that never changes the Publish result."""
- if dify_config.DEPLOYMENT_EDITION != DeploymentEdition.CLOUD:
- return
-
- try:
- revision = session.scalar(
- select(AgentConfigRevision)
- .where(
- AgentConfigRevision.tenant_id == tenant_id,
- AgentConfigRevision.agent_id == agent_id,
- AgentConfigRevision.current_snapshot_id == snapshot_id,
- AgentConfigRevision.operation == AgentConfigRevisionOperation.PUBLISH_DRAFT,
- )
- .limit(1)
- )
- if revision is None:
- logger.error(
- "New Agent Beta publish revision was not found, tenant_id=%s, agent_id=%s, snapshot_id=%s",
- tenant_id,
- agent_id,
- snapshot_id,
- )
- return
- if not _is_publish_in_activity_window(revision.created_at):
- return
- cancelled = False
-
- def cancel_on_rollback(_session: Session) -> None:
- nonlocal cancelled
- cancelled = True
-
- def dispatch_after_commit(_session: Session) -> None:
- if not cancelled:
- schedule_new_agent_beta_ensure(revision.id)
-
- event.listen(session, "after_rollback", cancel_on_rollback, once=True)
- event.listen(session, "after_commit", dispatch_after_commit, once=True)
- except Exception:
- logger.exception(
- "Failed to register New Agent Beta publish event, tenant_id=%s, agent_id=%s, snapshot_id=%s",
- tenant_id,
- agent_id,
- snapshot_id,
- )
-
-
-def register_new_agent_beta_workflow_publish_after_commit(
- *, session: Session, published_workflow_id: str, published_at: datetime
-) -> None:
- """Best-effort registration for a committed App Workflow publish."""
- if dify_config.DEPLOYMENT_EDITION != DeploymentEdition.CLOUD:
- return
-
- try:
- if not _is_publish_in_activity_window(published_at):
- return
- cancelled = False
-
- def cancel_on_rollback(_session: Session) -> None:
- nonlocal cancelled
- cancelled = True
-
- def dispatch_after_commit(_session: Session) -> None:
- if not cancelled:
- schedule_new_agent_beta_workflow_ensure(published_workflow_id)
-
- event.listen(session, "after_rollback", cancel_on_rollback, once=True)
- event.listen(session, "after_commit", dispatch_after_commit, once=True)
- except Exception:
- logger.exception(
- "Failed to register New Agent Beta Workflow publish event, published_workflow_id=%s",
- published_workflow_id,
- )
-
-
-@shared_task(
- queue=NEW_AGENT_BETA_QUEUE,
- bind=True,
- max_retries=_MAX_RETRIES,
- default_retry_delay=_RETRY_DELAY_SECONDS,
- acks_late=True,
- reject_on_worker_lost=True,
-)
-def ensure_new_agent_beta_participation_task(self, source_id: str, source_type: str) -> None:
- if source_type not in {"revision", "workflow"}:
- raise ValueError(f"Unsupported New Agent Beta source type: {source_type}")
-
- try:
- if source_type == "revision":
- BillingService.ensure_new_agent_beta_revision(source_id)
- else:
- BillingService.ensure_new_agent_beta_workflow(source_id)
- except Exception as exc:
- if self.request.retries >= _MAX_RETRIES:
- logger.exception(
- "New Agent Beta eligibility retry budget exhausted, source_type=%s, source_id=%s",
- source_type,
- source_id,
- )
- raise
-
- logger.warning(
- "New Agent Beta eligibility request failed, scheduling retry %d/%d, source_type=%s, source_id=%s",
- self.request.retries + 1,
- _MAX_RETRIES,
- source_type,
- source_id,
- exc_info=True,
- )
- countdown = min(_RETRY_DELAY_SECONDS * (2**self.request.retries), _MAX_RETRY_DELAY_SECONDS)
- raise self.retry(exc=exc, countdown=countdown)
-
-
-def schedule_new_agent_beta_ensure(revision_id: str) -> None:
- try:
- ensure_new_agent_beta_participation_task.delay(revision_id, "revision")
- except Exception:
- logger.exception("Failed to dispatch New Agent Beta eligibility task, revision_id=%s", revision_id)
-
-
-def schedule_new_agent_beta_workflow_ensure(published_workflow_id: str) -> None:
- try:
- ensure_new_agent_beta_participation_task.delay(published_workflow_id, "workflow")
- except Exception:
- logger.exception(
- "Failed to dispatch New Agent Beta Workflow eligibility task, published_workflow_id=%s",
- published_workflow_id,
- )
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 4c45bec5f56..55647c056b4 100644
--- a/api/tests/unit_tests/services/agent/test_agent_services.py
+++ b/api/tests/unit_tests/services/agent/test_agent_services.py
@@ -1029,7 +1029,6 @@ def test_publish_agent_app_draft_creates_published_snapshot(monkeypatch: pytest.
session.commit()
created: dict[str, object] = {}
calls: list[str] = []
- register_publish_event = MagicMock()
monkeypatch.setattr(composer_service.ComposerConfigValidator, "validate_publish_payload", lambda payload: None)
monkeypatch.setattr(composer_service, "agent_has_workflow_callable_active_snapshot", lambda **_kwargs: False)
@@ -1045,7 +1044,6 @@ def test_publish_agent_app_draft_creates_published_snapshot(monkeypatch: pytest.
lambda **kwargs: calls.append("create_version") or created.update(kwargs) or version,
)
monkeypatch.setattr(AgentComposerService, "_serialize_version", lambda _version: {"id": _version.id})
- monkeypatch.setattr(composer_service, "register_new_agent_beta_publish_after_commit", register_publish_event)
result = AgentComposerService.publish_agent_app_draft(
session=session,
@@ -1068,12 +1066,6 @@ def test_publish_agent_app_draft_creates_published_snapshot(monkeypatch: pytest.
assert app.enable_site is True
assert app.enable_api is True
assert app.updated_by == "account-1"
- register_publish_event.assert_called_once_with(
- session=session,
- tenant_id="tenant-1",
- agent_id="agent-1",
- snapshot_id="version-2",
- )
def test_repeated_publish_reuses_normal_draft_home_without_creating_resources(
diff --git a/api/tests/unit_tests/services/agent/test_workflow_publish_service.py b/api/tests/unit_tests/services/agent/test_workflow_publish_service.py
index c6962fecd53..9265c920aa9 100644
--- a/api/tests/unit_tests/services/agent/test_workflow_publish_service.py
+++ b/api/tests/unit_tests/services/agent/test_workflow_publish_service.py
@@ -227,13 +227,12 @@ def test_publish_copy_uses_current_roster_snapshot() -> None:
session.scalar.return_value = active_agent
session.scalars.return_value = SimpleNamespace(all=lambda: [binding])
- has_inline_agent = WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
+ WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
session=session,
draft_workflow=draft_workflow,
published_workflow=published_workflow,
)
- assert has_inline_agent is False
copied = session.add.call_args.args[0]
assert copied.agent_id == "roster-agent"
assert copied.current_snapshot_id == "active-snapshot"
@@ -307,14 +306,13 @@ def test_publish_binding_copy_keeps_previous_published_owner(
)
sqlite_session.add_all([app, previous_inline_binding, previous_roster_binding, draft_binding])
sqlite_session.commit()
- result = WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
+ WorkflowAgentPublishService.copy_agent_node_bindings_to_published(
session=sqlite_session,
draft_workflow=draft_workflow,
published_workflow=published_workflow,
)
sqlite_session.flush()
- assert result is True
assert sqlite_session.get(WorkflowAgentNodeBinding, previous_inline_binding.id) is previous_inline_binding
assert sqlite_session.get(WorkflowAgentNodeBinding, previous_roster_binding.id) is previous_roster_binding
copied = sqlite_session.scalar(
diff --git a/api/tests/unit_tests/services/test_billing_service.py b/api/tests/unit_tests/services/test_billing_service.py
index 762d7a71dcc..46ad4e8ef0f 100644
--- a/api/tests/unit_tests/services/test_billing_service.py
+++ b/api/tests/unit_tests/services/test_billing_service.py
@@ -177,30 +177,6 @@ class TestBillingServiceSendRequest:
call_args = mock_httpx_request.call_args
assert call_args[0][0] == method
- def test_new_agent_beta_ensure_uses_secret_authenticated_v1_base(self, mock_httpx_request, mock_billing_config):
- mock_response = MagicMock()
- mock_response.status_code = httpx.codes.OK
- mock_response.json.return_value = {"status": "issued"}
- mock_httpx_request.return_value = mock_response
-
- BillingService.ensure_new_agent_beta_revision("revision-1")
-
- call_args = mock_httpx_request.call_args
- assert call_args.args == (
- "POST",
- "https://billing-api.example.com/new-agent-beta/revisions/revision-1/ensure",
- )
- assert call_args.kwargs["headers"]["Billing-Api-Secret-Key"] == "test-secret-key"
-
- def test_new_agent_beta_ensure_requires_json_response(self, mock_httpx_request, mock_billing_config):
- mock_response = MagicMock()
- mock_response.status_code = httpx.codes.OK
- mock_response.json.side_effect = json.JSONDecodeError("Expecting value", "", 0)
- mock_httpx_request.return_value = mock_response
-
- with pytest.raises(json.JSONDecodeError):
- BillingService.ensure_new_agent_beta_revision("revision-1")
-
@pytest.mark.parametrize(
"status_code", [httpx.codes.BAD_REQUEST, httpx.codes.INTERNAL_SERVER_ERROR, httpx.codes.NOT_FOUND]
)
diff --git a/api/tests/unit_tests/services/test_workflow_service.py b/api/tests/unit_tests/services/test_workflow_service.py
index 5953ba92626..492e645391b 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -1280,12 +1280,7 @@ class TestWorkflowService:
sqlite_session.add(draft)
sqlite_session.commit()
- with (
- patch("services.workflow_service.app_published_workflow_was_updated"),
- patch(
- "services.workflow_service.register_new_agent_beta_workflow_publish_after_commit"
- ) as register_workflow_publish,
- ):
+ with patch("services.workflow_service.app_published_workflow_was_updated"):
result = workflow_service.publish_workflow(
session=sqlite_session,
app_model=app,
@@ -1299,41 +1294,6 @@ class TestWorkflowService:
assert result.version != Workflow.VERSION_DRAFT
assert result.marked_name == "Version 1"
assert result.marked_comment == "Initial release"
- register_workflow_publish.assert_not_called()
-
- def test_publish_workflow_registers_inline_agent_after_commit(
- self, workflow_service: WorkflowService, sqlite_session: Session
- ) -> None:
- app = TestWorkflowAssociatedDataFactory.create_app()
- account = TestWorkflowAssociatedDataFactory.create_account()
- draft = TestWorkflowAssociatedDataFactory.create_workflow(
- version=Workflow.VERSION_DRAFT,
- graph=TestWorkflowAssociatedDataFactory.create_valid_workflow_graph(),
- )
- sqlite_session.add(draft)
- sqlite_session.commit()
-
- with (
- patch("services.workflow_service.app_published_workflow_was_updated"),
- patch(
- "services.agent.workflow_publish_service.WorkflowAgentPublishService.copy_agent_node_bindings_to_published",
- return_value=True,
- ),
- patch(
- "services.workflow_service.register_new_agent_beta_workflow_publish_after_commit"
- ) as register_workflow_publish,
- ):
- published = workflow_service.publish_workflow(
- session=sqlite_session,
- app_model=app,
- account=account,
- )
-
- register_workflow_publish.assert_called_once_with(
- session=sqlite_session,
- published_workflow_id=published.id,
- published_at=published.created_at,
- )
def test_publish_workflow_numbers_versions_from_one(
self, workflow_service: WorkflowService, sqlite_session: Session
diff --git a/api/tests/unit_tests/tasks/test_new_agent_beta_task.py b/api/tests/unit_tests/tasks/test_new_agent_beta_task.py
deleted file mode 100644
index 18fbe774117..00000000000
--- a/api/tests/unit_tests/tasks/test_new_agent_beta_task.py
+++ /dev/null
@@ -1,297 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime
-from typing import Protocol, cast
-from unittest.mock import MagicMock
-
-import pytest
-from sqlalchemy.orm import Session
-
-from enums import DeploymentEdition
-from models.agent import AgentConfigRevision, AgentConfigRevisionOperation
-from services.billing_service import BillingService
-from tasks import new_agent_beta_task as task_module
-from tasks.new_agent_beta_task import (
- NEW_AGENT_BETA_QUEUE,
- ensure_new_agent_beta_participation_task,
- register_new_agent_beta_publish_after_commit,
- register_new_agent_beta_workflow_publish_after_commit,
- schedule_new_agent_beta_ensure,
- schedule_new_agent_beta_workflow_ensure,
-)
-from tests.unit_tests.config_override import apply_config_overrides
-
-
-class _TaskWithQueue(Protocol):
- queue: str
-
-
-def _configure_cloud_publish(monkeypatch: pytest.MonkeyPatch) -> None:
- apply_config_overrides(
- monkeypatch,
- DEPLOYMENT_EDITION=DeploymentEdition.CLOUD,
- NEW_AGENT_BETA_ACTIVITY_START_AT=datetime(2026, 8, 12, tzinfo=UTC),
- NEW_AGENT_BETA_ACTIVITY_END_AT=datetime(2026, 8, 13, tzinfo=UTC),
- )
-
-
[email protected]("sqlite_session", [(AgentConfigRevision,)], indirect=True)
-def test_publish_event_is_dispatched_only_after_commit(
- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session
-) -> None:
- published_at = datetime(2026, 8, 12, 1, 0)
- _configure_cloud_publish(monkeypatch)
- revision = AgentConfigRevision(
- id="revision-1",
- tenant_id="tenant-1",
- agent_id="agent-1",
- current_snapshot_id="snapshot-1",
- revision=1,
- operation=AgentConfigRevisionOperation.PUBLISH_DRAFT,
- created_at=published_at,
- )
- sqlite_session.add(revision)
- sqlite_session.flush()
- dispatch = MagicMock()
- monkeypatch.setattr(task_module, "schedule_new_agent_beta_ensure", dispatch)
-
- register_new_agent_beta_publish_after_commit(
- session=sqlite_session,
- tenant_id="tenant-1",
- agent_id="agent-1",
- snapshot_id="snapshot-1",
- )
-
- dispatch.assert_not_called()
- sqlite_session.commit()
- dispatch.assert_called_once_with("revision-1")
-
-
[email protected]("sqlite_session", [(AgentConfigRevision,)], indirect=True)
-def test_rolled_back_publish_is_never_dispatched(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session) -> None:
- published_at = datetime(2026, 8, 12, 1, 0)
- _configure_cloud_publish(monkeypatch)
- sqlite_session.add(
- AgentConfigRevision(
- id="revision-1",
- tenant_id="tenant-1",
- agent_id="agent-1",
- current_snapshot_id="snapshot-1",
- revision=1,
- operation=AgentConfigRevisionOperation.PUBLISH_DRAFT,
- created_at=published_at,
- )
- )
- sqlite_session.flush()
- dispatch = MagicMock()
- monkeypatch.setattr(task_module, "schedule_new_agent_beta_ensure", dispatch)
-
- register_new_agent_beta_publish_after_commit(
- session=sqlite_session,
- tenant_id="tenant-1",
- agent_id="agent-1",
- snapshot_id="snapshot-1",
- )
- sqlite_session.rollback()
- sqlite_session.commit()
-
- dispatch.assert_not_called()
-
-
-def test_workflow_publish_event_is_dispatched_only_after_commit(
- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session
-) -> None:
- _configure_cloud_publish(monkeypatch)
- dispatch = MagicMock()
- monkeypatch.setattr(task_module, "schedule_new_agent_beta_workflow_ensure", dispatch)
- sqlite_session.begin()
-
- register_new_agent_beta_workflow_publish_after_commit(
- session=sqlite_session,
- published_workflow_id="workflow-1",
- published_at=datetime(2026, 8, 12, 1, 0),
- )
-
- dispatch.assert_not_called()
- sqlite_session.commit()
- dispatch.assert_called_once_with("workflow-1")
-
-
-def test_rolled_back_workflow_publish_is_never_dispatched(
- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session
-) -> None:
- _configure_cloud_publish(monkeypatch)
- dispatch = MagicMock()
- monkeypatch.setattr(task_module, "schedule_new_agent_beta_workflow_ensure", dispatch)
- sqlite_session.begin()
-
- register_new_agent_beta_workflow_publish_after_commit(
- session=sqlite_session,
- published_workflow_id="workflow-1",
- published_at=datetime(2026, 8, 12, 1, 0),
- )
- sqlite_session.rollback()
- sqlite_session.commit()
-
- dispatch.assert_not_called()
-
-
-def test_non_cloud_publish_skips_revision_lookup(monkeypatch: pytest.MonkeyPatch) -> None:
- apply_config_overrides(monkeypatch, DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY)
- session = MagicMock()
-
- register_new_agent_beta_publish_after_commit(
- session=session,
- tenant_id="tenant-1",
- agent_id="agent-1",
- snapshot_id="snapshot-1",
- )
-
- session.scalar.assert_not_called()
-
-
- ("start", "end", "published_at", "expected"),
- [
- (datetime(2026, 8, 12, tzinfo=UTC), datetime(2026, 8, 13, tzinfo=UTC), datetime(2026, 8, 12), True),
- (datetime(2026, 8, 12, tzinfo=UTC), datetime(2026, 8, 13, tzinfo=UTC), datetime(2026, 8, 13), False),
- (None, datetime(2026, 8, 13, tzinfo=UTC), datetime(2026, 8, 12), False),
- (datetime(2026, 8, 13, tzinfo=UTC), datetime(2026, 8, 12, tzinfo=UTC), datetime(2026, 8, 12), False),
- ],
-)
-def test_publish_activity_window_is_inclusive_start_exclusive_end(
- monkeypatch: pytest.MonkeyPatch,
- start: datetime | None,
- end: datetime | None,
- published_at: datetime,
- expected: bool,
-) -> None:
- apply_config_overrides(
- monkeypatch,
- NEW_AGENT_BETA_ACTIVITY_START_AT=start,
- NEW_AGENT_BETA_ACTIVITY_END_AT=end,
- )
-
- assert task_module._is_publish_in_activity_window(published_at) is expected
-
-
-def test_broker_failure_does_not_propagate(monkeypatch: pytest.MonkeyPatch) -> None:
- delay = MagicMock(side_effect=RuntimeError("broker unavailable"))
- monkeypatch.setattr(
- ensure_new_agent_beta_participation_task,
- "delay",
- delay,
- )
-
- schedule_new_agent_beta_ensure("revision-1")
- delay.assert_called_once_with("revision-1", "revision")
-
-
-def test_workflow_broker_failure_does_not_propagate(monkeypatch: pytest.MonkeyPatch) -> None:
- delay = MagicMock(side_effect=RuntimeError("broker unavailable"))
- monkeypatch.setattr(
- ensure_new_agent_beta_participation_task,
- "delay",
- delay,
- )
-
- schedule_new_agent_beta_workflow_ensure("workflow-1")
- delay.assert_called_once_with("workflow-1", "workflow")
-
-
-def test_task_calls_billing_with_revision_id(monkeypatch: pytest.MonkeyPatch) -> None:
- ensure = MagicMock()
- monkeypatch.setattr(BillingService, "ensure_new_agent_beta_revision", ensure)
-
- ensure_new_agent_beta_participation_task.run("revision-1", "revision")
-
- ensure.assert_called_once_with("revision-1")
-
-
-def test_workflow_task_calls_billing_with_published_workflow_id(monkeypatch: pytest.MonkeyPatch) -> None:
- ensure = MagicMock()
- monkeypatch.setattr(BillingService, "ensure_new_agent_beta_workflow", ensure)
-
- ensure_new_agent_beta_participation_task.run("workflow-1", "workflow")
-
- ensure.assert_called_once_with("workflow-1")
-
-
-def test_task_is_redelivered_when_worker_is_lost() -> None:
- task = cast(_TaskWithQueue, ensure_new_agent_beta_participation_task)
-
- assert task.queue == NEW_AGENT_BETA_QUEUE
- assert ensure_new_agent_beta_participation_task.acks_late is True
- assert ensure_new_agent_beta_participation_task.reject_on_worker_lost is True
- assert ensure_new_agent_beta_participation_task.max_retries == 8
-
-
-def test_task_retries_billing_failure(monkeypatch: pytest.MonkeyPatch) -> None:
- error = RuntimeError("billing unavailable")
- monkeypatch.setattr(BillingService, "ensure_new_agent_beta_revision", MagicMock(side_effect=error))
- retry = MagicMock(side_effect=RuntimeError("retry scheduled"))
- monkeypatch.setattr(ensure_new_agent_beta_participation_task, "retry", retry)
-
- with pytest.raises(RuntimeError, match="retry scheduled"):
- ensure_new_agent_beta_participation_task.run("revision-1", "revision")
-
- retry.assert_called_once_with(exc=error, countdown=30)
-
-
-def test_workflow_task_retries_billing_failure(monkeypatch: pytest.MonkeyPatch) -> None:
- error = RuntimeError("billing unavailable")
- monkeypatch.setattr(BillingService, "ensure_new_agent_beta_workflow", MagicMock(side_effect=error))
- retry = MagicMock(side_effect=RuntimeError("retry scheduled"))
- monkeypatch.setattr(ensure_new_agent_beta_participation_task, "retry", retry)
-
- with pytest.raises(RuntimeError, match="retry scheduled"):
- ensure_new_agent_beta_participation_task.run("workflow-1", "workflow")
-
- retry.assert_called_once_with(exc=error, countdown=30)
-
-
-def test_task_rejects_unknown_source_type() -> None:
- with pytest.raises(ValueError, match="Unsupported New Agent Beta source type"):
- ensure_new_agent_beta_participation_task.run("source-1", "unknown")
-
-
-def test_task_requires_source_type() -> None:
- run_without_source_type = cast(Callable[[str], None], ensure_new_agent_beta_participation_task.run)
- with pytest.raises(TypeError, match="source_type"):
- run_without_source_type("source-1")
-
-
-def test_task_caps_exponential_retry_delay(monkeypatch: pytest.MonkeyPatch) -> None:
- error = RuntimeError("billing unavailable")
- monkeypatch.setattr(BillingService, "ensure_new_agent_beta_revision", MagicMock(side_effect=error))
- monkeypatch.setattr(ensure_new_agent_beta_participation_task.request, "retries", 7)
- retry = MagicMock(side_effect=RuntimeError("retry scheduled"))
- monkeypatch.setattr(ensure_new_agent_beta_participation_task, "retry", retry)
-
- with pytest.raises(RuntimeError, match="retry scheduled"):
- ensure_new_agent_beta_participation_task.run("revision-1", "revision")
-
- retry.assert_called_once_with(exc=error, countdown=900)
-
-
-def test_billing_contract_uses_internal_ensure_endpoint(monkeypatch: pytest.MonkeyPatch) -> None:
- send_request = MagicMock(return_value={"status": "issued"})
- monkeypatch.setattr(BillingService, "_send_request", send_request)
-
- BillingService.ensure_new_agent_beta_revision("revision-1")
-
- send_request.assert_called_once_with(
- "POST",
- "/new-agent-beta/revisions/revision-1/ensure",
- )
-
-
-def test_billing_workflow_contract_uses_internal_ensure_endpoint(monkeypatch: pytest.MonkeyPatch) -> None:
- send_request = MagicMock(return_value={"status": "issued"})
- monkeypatch.setattr(BillingService, "_send_request", send_request)
-
- BillingService.ensure_new_agent_beta_workflow("workflow-1")
-
- send_request.assert_called_once_with(
- "POST",
- "/new-agent-beta/workflows/workflow-1/ensure",
- )