Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-code into master-nj
# Conflicts: # frontend-web/src/components/workspace/messages/message-group.tsx # offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/prompt.py
This commit is contained in:
commit
57b6a89f20
21 files changed
+441
-115
No files matched your search
@@ -112,6 +112,7 @@ def test_es_query_routing_registration_log_explains_custom_agent_exclusion(caplo
|
||||
|
||||
def test_formal_markdown_rules_are_scoped_to_ordinary_qa(monkeypatch) -> None:
|
||||
config = _app_config(enabled=False)
|
||||
monkeypatch.setattr(prompt_module, "_ordinary_qa_markdown_format_enabled", lambda: True)
|
||||
monkeypatch.setattr(prompt_module, "_get_memory_context", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "get_agent_soul", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "get_skills_prompt_section", lambda *args, **kwargs: "")
|
||||
@@ -134,3 +135,19 @@ def test_formal_markdown_rules_are_scoped_to_ordinary_qa(monkeypatch) -> None:
|
||||
assert '<ordinary_qa_markdown_format>' not in writing_prompt
|
||||
assert '<ordinary_qa_markdown_format>' not in notebook_prompt
|
||||
assert '<ordinary_qa_markdown_format>' not in scheduled_prompt
|
||||
|
||||
|
||||
def test_formal_markdown_rules_are_disabled_when_switch_is_off(monkeypatch) -> None:
|
||||
config = _app_config(enabled=False)
|
||||
monkeypatch.setattr(prompt_module, "_ordinary_qa_markdown_format_enabled", lambda: False)
|
||||
monkeypatch.setattr(prompt_module, "_get_memory_context", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "get_agent_soul", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "get_skills_prompt_section", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "get_deferred_tools_prompt_section", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "_build_acp_section", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "_build_custom_mounts_section", lambda *args, **kwargs: "")
|
||||
monkeypatch.setattr(prompt_module, "_current_time_context", lambda: "")
|
||||
|
||||
ordinary_prompt = prompt_module.apply_prompt_template(app_config=config)
|
||||
|
||||
assert '<ordinary_qa_markdown_format>' not in ordinary_prompt
|
||||
@@ -9,7 +9,9 @@ from types import SimpleNamespace
|
||||
import pytest
|
||||
from langchain_core.messages import AIMessage, HumanMessage
|
||||
|
||||
from app.gateway.routers import system_settings as ss_router
|
||||
from app.gateway.services import _prepend_prompt_prefix, _prompt_prefix_opted_in
|
||||
from deerflow.agents.lead_agent import prompt as prompt_module
|
||||
from deerflow.config import system_settings as ss
|
||||
|
||||
|
||||
@@ -28,6 +30,9 @@ def test_load_returns_defaults_when_missing(tmp_runtime_home: Path) -> None:
|
||||
settings = ss.load_system_settings()
|
||||
assert settings.prompt_prefix.enabled is False
|
||||
assert settings.prompt_prefix.prompt_prefix == ""
|
||||
assert settings.prompt_prefix.ordinary_qa_markdown_format_enabled is False
|
||||
assert settings.citation_display.reference_mode_enabled is False
|
||||
assert settings.citation_display.cleanup_words == []
|
||||
|
||||
|
||||
def test_save_then_load_roundtrips(tmp_runtime_home: Path) -> None:
|
||||
@@ -36,6 +41,7 @@ def test_save_then_load_roundtrips(tmp_runtime_home: Path) -> None:
|
||||
enabled=True,
|
||||
switch_label="加入立场前缀",
|
||||
prompt_prefix="你需要站在中方角度",
|
||||
ordinary_qa_markdown_format_enabled=True,
|
||||
)
|
||||
)
|
||||
ss.save_system_settings(settings)
|
||||
@@ -49,6 +55,88 @@ def test_save_then_load_roundtrips(tmp_runtime_home: Path) -> None:
|
||||
assert reloaded.prompt_prefix.enabled is True
|
||||
assert reloaded.prompt_prefix.switch_label == "加入立场前缀"
|
||||
assert reloaded.prompt_prefix.prompt_prefix == "你需要站在中方角度"
|
||||
assert reloaded.prompt_prefix.ordinary_qa_markdown_format_enabled is True
|
||||
|
||||
|
||||
def test_runtime_markdown_format_switch_defaults_off_and_updates_without_restart(
|
||||
tmp_runtime_home: Path,
|
||||
) -> None:
|
||||
assert prompt_module._ordinary_qa_markdown_format_enabled() is False
|
||||
|
||||
ss.save_system_settings(
|
||||
ss.SystemSettings(
|
||||
prompt_prefix=ss.PromptPrefixSettings(
|
||||
ordinary_qa_markdown_format_enabled=True,
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
assert prompt_module._ordinary_qa_markdown_format_enabled() is True
|
||||
|
||||
|
||||
def _patch_admin(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
admin = SimpleNamespace(
|
||||
id="admin1",
|
||||
system_role="admin",
|
||||
email="admin@example.com",
|
||||
)
|
||||
|
||||
async def _optional(_request):
|
||||
return admin
|
||||
|
||||
monkeypatch.setattr(ss_router, "get_optional_user_from_request", _optional)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_prompt_settings_update_can_enable_markdown_format_without_changing_prefix(
|
||||
tmp_runtime_home: Path,
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
_patch_admin(monkeypatch)
|
||||
current = ss.SystemSettings(
|
||||
prompt_prefix=ss.PromptPrefixSettings(
|
||||
enabled=True,
|
||||
switch_label="加入立场前缀",
|
||||
prompt_prefix="你需要站在中方角度",
|
||||
)
|
||||
)
|
||||
ss.save_system_settings(current)
|
||||
|
||||
response = await ss_router.update_prompt_prefix(
|
||||
ss_router.PromptPrefixUpdateRequest(ordinary_qa_markdown_format_enabled=True),
|
||||
SimpleNamespace(),
|
||||
)
|
||||
|
||||
assert response.ordinary_qa_markdown_format_enabled is True
|
||||
assert response.enabled is True
|
||||
assert response.switch_label == "加入立场前缀"
|
||||
assert response.prompt_prefix == "你需要站在中方角度"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_citation_display_update_preserves_unspecified_fields(
|
||||
tmp_runtime_home: Path,
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
_patch_admin(monkeypatch)
|
||||
current = ss.SystemSettings(
|
||||
citation_display=ss.CitationDisplaySettings(
|
||||
cleanup_words=["广告", "免责声明"],
|
||||
)
|
||||
)
|
||||
ss.save_system_settings(current)
|
||||
|
||||
response = await ss_router.update_citation_display(
|
||||
ss_router.CitationDisplayUpdateRequest(reference_mode_enabled=True),
|
||||
SimpleNamespace(),
|
||||
)
|
||||
|
||||
assert response.reference_mode_enabled is True
|
||||
assert response.cleanup_words == ["广告", "免责声明"]
|
||||
|
||||
payload = json.loads((tmp_runtime_home / "system_settings.json").read_text(encoding="utf-8"))
|
||||
assert payload["citation_display"]["reference_mode_enabled"] is True
|
||||
assert payload["citation_display"]["cleanup_words"] == ["广告", "免责声明"]
|
||||
|
||||
|
||||
def test_prepend_prefix_tags_first_human_without_touching_content() -> None:
|
||||
|
||||
Reference in new issue
Block a user