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.

test: use real moderation configuration and queues (#43161)

Asuka Minato8edc40e2f12b
diff --git a/api/tests/unit_tests/core/moderation/test_input_moderation.py b/api/tests/unit_tests/core/moderation/test_input_moderation.py
index 8822b60d68d..a98fed2a1f3 100644
--- a/api/tests/unit_tests/core/moderation/test_input_moderation.py
+++ b/api/tests/unit_tests/core/moderation/test_input_moderation.py
@@ -1,6 +1,8 @@
+import queue
from unittest.mock import MagicMock, patch
import pytest
+from flask import Flask
from core.app.app_config.entities import AppConfig, SensitiveWordAvoidanceEntity
from core.moderation.base import ModerationAction, ModerationError, ModerationInputsResult
@@ -13,10 +15,20 @@ from models.model import AppMode
class TestInputModeration:
@pytest.fixture
def app_config(self):
- config = MagicMock(spec=AppConfig)
- config.app_mode = AppMode.CHAT
- config.sensitive_word_avoidance = None
- return config
+ return AppConfig(tenant_id="test_tenant_id", app_id="test_app_id", app_mode=AppMode.CHAT)
+
+ @pytest.fixture
+ def trace_manager(self):
+ with (
+ Flask(__name__).app_context(),
+ patch("core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=None),
+ patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True),
+ patch("core.ops.ops_trace_manager.trace_manager_queue", queue.Queue()),
+ patch.object(TraceQueueManager, "start_timer"),
+ ):
+ manager = TraceQueueManager(app_id="test_app_id")
+ with patch.object(manager, "add_trace_task", wraps=manager.add_trace_task):
+ yield manager
@pytest.fixture
def input_moderation(self):
@@ -46,9 +58,7 @@ class TestInputModeration:
message_id = "test_message_id"
# Setup config
- sensitive_word_config = MagicMock(spec=SensitiveWordAvoidanceEntity)
- sensitive_word_config.type = "keywords"
- sensitive_word_config.config = {"keywords": ["bad"]}
+ sensitive_word_config = SensitiveWordAvoidanceEntity(type="keywords", config={"keywords": ["bad"]})
app_config.sensitive_word_avoidance = sensitive_word_config
# Setup factory mock
@@ -70,18 +80,17 @@ class TestInputModeration:
@patch("core.moderation.input_moderation.ModerationFactory")
@patch("core.moderation.input_moderation.TraceTask")
- def test_check_with_trace_manager(self, mock_trace_task, mock_factory_cls, app_config, input_moderation):
+ def test_check_with_trace_manager(
+ self, mock_trace_task, mock_factory_cls, app_config, input_moderation, trace_manager
+ ):
app_id = "test_app_id"
tenant_id = "test_tenant_id"
inputs = {"input_key": "input_value"}
query = "test query"
message_id = "test_message_id"
- trace_manager = MagicMock(spec=TraceQueueManager)
# Setup config
- sensitive_word_config = MagicMock(spec=SensitiveWordAvoidanceEntity)
- sensitive_word_config.type = "keywords"
- sensitive_word_config.config = {}
+ sensitive_word_config = SensitiveWordAvoidanceEntity(type="keywords", config={})
app_config.sensitive_word_avoidance = sensitive_word_config
# Setup factory mock
@@ -100,6 +109,7 @@ class TestInputModeration:
)
trace_manager.add_trace_task.assert_called_once_with(mock_trace_task.return_value)
+ assert trace_manager.collect_tasks() == [mock_trace_task.return_value]
mock_trace_task.assert_called_once()
call_kwargs = mock_trace_task.call_args.kwargs
call_args = mock_trace_task.call_args.args
@@ -118,9 +128,7 @@ class TestInputModeration:
message_id = "test_message_id"
# Setup config
- sensitive_word_config = MagicMock(spec=SensitiveWordAvoidanceEntity)
- sensitive_word_config.type = "keywords"
- sensitive_word_config.config = {}
+ sensitive_word_config = SensitiveWordAvoidanceEntity(type="keywords", config={})
app_config.sensitive_word_avoidance = sensitive_word_config
# Setup factory mock
@@ -151,9 +159,7 @@ class TestInputModeration:
message_id = "test_message_id"
# Setup config
- sensitive_word_config = MagicMock(spec=SensitiveWordAvoidanceEntity)
- sensitive_word_config.type = "keywords"
- sensitive_word_config.config = {}
+ sensitive_word_config = SensitiveWordAvoidanceEntity(type="keywords", config={})
app_config.sensitive_word_avoidance = sensitive_word_config
# Setup factory mock
@@ -183,9 +189,7 @@ class TestInputModeration:
message_id = "test_message_id"
# Setup config
- sensitive_word_config = MagicMock(spec=SensitiveWordAvoidanceEntity)
- sensitive_word_config.type = "keywords"
- sensitive_word_config.config = {}
+ sensitive_word_config = SensitiveWordAvoidanceEntity(type="keywords", config={})
app_config.sensitive_word_avoidance = sensitive_word_config
# Setup factory mock
diff --git a/api/tests/unit_tests/core/moderation/test_output_moderation.py b/api/tests/unit_tests/core/moderation/test_output_moderation.py
index f51fc2ac7d0..ceafd9f04d3 100644
--- a/api/tests/unit_tests/core/moderation/test_output_moderation.py
+++ b/api/tests/unit_tests/core/moderation/test_output_moderation.py
@@ -3,7 +3,9 @@ from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
-from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
+from core.app.apps.base_app_queue_manager import PublishFrom
+from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
+from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueMessageReplaceEvent
from core.moderation.base import ModerationAction, ModerationOutputsResult
from core.moderation.output_moderation import ModerationRule, OutputModeration
@@ -11,17 +13,27 @@ from core.moderation.output_moderation import ModerationRule, OutputModeration
class TestOutputModeration:
@pytest.fixture
- def mock_queue_manager(self):
- return MagicMock(spec=AppQueueManager)
+ def queue_manager(self):
+ with patch("core.app.apps.base_app_queue_manager.redis_client.setex"):
+ manager = MessageBasedAppQueueManager(
+ task_id="test-task",
+ user_id="test-user",
+ invoke_from=InvokeFrom.SERVICE_API,
+ conversation_id="test-conversation",
+ app_mode="chat",
+ message_id="test-message",
+ )
+ manager.publish = MagicMock(wraps=manager.publish)
+ return manager
@pytest.fixture
def moderation_rule(self):
return ModerationRule(type="keywords", config={"keywords": "badword"})
@pytest.fixture
- def output_moderation(self, mock_queue_manager, moderation_rule: ModerationRule):
+ def output_moderation(self, queue_manager, moderation_rule: ModerationRule):
return OutputModeration(
- tenant_id="test_tenant", app_id="test_app", rule=moderation_rule, queue_manager=mock_queue_manager
+ tenant_id="test_tenant", app_id="test_app", rule=moderation_rule, queue_manager=queue_manager
)
def test_should_direct_output(self, output_moderation: OutputModeration):
@@ -55,7 +67,7 @@ class TestOutputModeration:
assert flagged is False
assert output_moderation.is_final_chunk is True
- def test_moderation_completion_flagged_direct_output(self, output_moderation: OutputModeration, mock_queue_manager):
+ def test_moderation_completion_flagged_direct_output(self, output_moderation: OutputModeration, queue_manager):
with patch.object(OutputModeration, "moderation") as mock_moderation:
mock_moderation.return_value = ModerationOutputsResult(
flagged=True, action=ModerationAction.DIRECT_OUTPUT, preset_response="preset"
@@ -65,13 +77,13 @@ class TestOutputModeration:
assert output == "preset"
assert flagged is True
- mock_queue_manager.publish.assert_called_once()
- args, _ = mock_queue_manager.publish.call_args
+ queue_manager.publish.assert_called_once()
+ args, _ = queue_manager.publish.call_args
assert isinstance(args[0], QueueMessageReplaceEvent)
assert args[0].text == "preset"
assert args[1] == PublishFrom.TASK_PIPELINE
- def test_moderation_completion_flagged_overridden(self, output_moderation: OutputModeration, mock_queue_manager):
+ def test_moderation_completion_flagged_overridden(self, output_moderation: OutputModeration, queue_manager):
with patch.object(OutputModeration, "moderation") as mock_moderation:
mock_moderation.return_value = ModerationOutputsResult(
flagged=True, action=ModerationAction.OVERRIDDEN, text="masked content"
@@ -81,14 +93,13 @@ class TestOutputModeration:
assert output == "masked content"
assert flagged is True
- mock_queue_manager.publish.assert_called_once()
- args, _ = mock_queue_manager.publish.call_args
+ queue_manager.publish.assert_called_once()
+ args, _ = queue_manager.publish.call_args
assert args[0].text == "masked content"
def test_start_thread(self, output_moderation: OutputModeration):
- mock_app = MagicMock(spec=Flask)
- with patch("core.moderation.output_moderation.current_app") as mock_current_app:
- mock_current_app._get_current_object = MagicMock(return_value=mock_app)
+ app = Flask(__name__)
+ with app.app_context():
with patch("threading.Thread") as mock_thread_class:
mock_thread_instance = MagicMock()
mock_thread_class.return_value = mock_thread_instance
@@ -132,16 +143,16 @@ class TestOutputModeration:
result = output_moderation.moderation("tenant", "app", "buffer")
assert result is None
- def test_worker_loop_and_exit(self, output_moderation: OutputModeration, mock_queue_manager):
- mock_app = MagicMock(spec=Flask)
+ def test_worker_loop_and_exit(self, output_moderation: OutputModeration, queue_manager):
+ app = Flask(__name__)
# Test exit on thread_running=False
output_moderation.thread_running = False
- output_moderation.worker(mock_app, 10)
+ output_moderation.worker(app, 10)
# Should exit immediately
def test_worker_no_flag(self, output_moderation: OutputModeration):
- mock_app = MagicMock(spec=Flask)
+ app = Flask(__name__)
with patch.object(OutputModeration, "moderation") as mock_moderation:
mock_moderation.return_value = ModerationOutputsResult(flagged=False, action=ModerationAction.DIRECT_OUTPUT)
@@ -156,12 +167,12 @@ class TestOutputModeration:
mock_moderation.side_effect = side_effect
- output_moderation.worker(mock_app, 10)
+ output_moderation.worker(app, 10)
assert mock_moderation.called
- def test_worker_flagged_direct_output(self, output_moderation: OutputModeration, mock_queue_manager):
- mock_app = MagicMock(spec=Flask)
+ def test_worker_flagged_direct_output(self, output_moderation: OutputModeration, queue_manager):
+ app = Flask(__name__)
with patch.object(OutputModeration, "moderation") as mock_moderation:
mock_moderation.return_value = ModerationOutputsResult(
@@ -171,14 +182,14 @@ class TestOutputModeration:
output_moderation.buffer = "badword"
output_moderation.is_final_chunk = True
- output_moderation.worker(mock_app, 10)
+ output_moderation.worker(app, 10)
assert output_moderation.final_output == "preset"
- mock_queue_manager.publish.assert_called_once()
+ queue_manager.publish.assert_called_once()
# It breaks on DIRECT_OUTPUT
- def test_worker_flagged_overridden(self, output_moderation: OutputModeration, mock_queue_manager):
- mock_app = MagicMock(spec=Flask)
+ def test_worker_flagged_overridden(self, output_moderation: OutputModeration, queue_manager):
+ app = Flask(__name__)
with patch.object(OutputModeration, "moderation") as mock_moderation:
# Use side_effect to change thread_running on second call
@@ -193,14 +204,14 @@ class TestOutputModeration:
output_moderation.buffer = "badword"
output_moderation.is_final_chunk = True
- output_moderation.worker(mock_app, 10)
+ output_moderation.worker(app, 10)
- mock_queue_manager.publish.assert_called_once()
- args, _ = mock_queue_manager.publish.call_args
+ queue_manager.publish.assert_called_once()
+ args, _ = queue_manager.publish.call_args
assert args[0].text == "masked"
def test_worker_chunk_too_small(self, output_moderation: OutputModeration):
- mock_app = MagicMock(spec=Flask)
+ app = Flask(__name__)
with patch("time.sleep") as mock_sleep:
# chunk_length < buffer_size and not is_final_chunk
output_moderation.buffer = "123" # length 3
@@ -211,12 +222,12 @@ class TestOutputModeration:
mock_sleep.side_effect = sleep_side_effect
- output_moderation.worker(mock_app, 10) # buffer_size 10
+ output_moderation.worker(app, 10) # buffer_size 10
mock_sleep.assert_called_once_with(1)
- def test_worker_empty_not_flagged(self, output_moderation: OutputModeration, mock_queue_manager):
- mock_app = MagicMock(spec=Flask)
+ def test_worker_empty_not_flagged(self, output_moderation: OutputModeration, queue_manager):
+ app = Flask(__name__)
with patch.object(OutputModeration, "moderation") as mock_moderation:
# Return None (exception or no rule)
mock_moderation.return_value = None
@@ -229,6 +240,6 @@ class TestOutputModeration:
output_moderation.buffer = "something"
output_moderation.is_final_chunk = True
- output_moderation.worker(mock_app, 10)
+ output_moderation.worker(app, 10)
- mock_queue_manager.publish.assert_not_called()
+ queue_manager.publish.assert_not_called()