代码合并

This commit is contained in:
董宏凯 committed 2026-09-08 09:40:31 +08:00
1 parent b0970de677
commit 8859c13cfb
26 files changed
+1707 -334

No files matched your search

@@ -7,7 +7,7 @@ from types import SimpleNamespace
import pytest
from app.report_collaboration.agentscope_runtime.event_adapter import ConversationReplica, MemberStreamContext, SeqAllocator, make_emitter
from app.report_collaboration.agentscope_runtime.model_adapter import DeerFlowChatModelAdapter, ModelAdapterError, record_attempt_usage, redact_secrets
from app.report_collaboration.agentscope_runtime.model_adapter import DeerFlowChatModelAdapter, ModelAdapterError, estimate_tokens_for_text, record_attempt_usage, redact_secrets
from app.report_collaboration.agentscope_runtime.model_resolver import freeze_plan_models, resolve_role_model
from deerflow.config.app_config import AppConfig
from deerflow.config.model_config import ModelConfig
@@ -128,6 +128,33 @@ async def test_adapter_streams_text_tool_and_usage() -> None:
assert frozen.value.code == "MODEL_FROZEN"
@pytest.mark.asyncio
async def test_adapter_count_tokens_and_context_size_contract() -> None:
"""AgentScope compress_context 依赖 model.context_size 与 count_tokens(messages, tools)。"""
snapshot = resolve_role_model("researcher", app_config=_app())
adapter = DeerFlowChatModelAdapter(snapshot, app_config=_app())
assert isinstance(adapter.context_size, int) and adapter.context_size > 0
class _Msg:
def __init__(self, text: str) -> None:
self.content = text
def get_content_blocks(self):
return [{"type": "text", "text": self.content}]
agentscope_style = [_Msg("市场分析" * 20)]
tokens_msg = await adapter.count_tokens(agentscope_style, None)
dict_style = [{"role": "user", "content": "hello world"}]
tokens_dict = await adapter.count_tokens(dict_style, None)
tools = [{"name": "web_search", "parameters": {"type": "object"}}]
tokens_tools = await adapter.count_tokens(dict_style, tools)
assert tokens_msg > 0
assert tokens_dict == estimate_tokens_for_text("hello world")
assert tokens_tools > tokens_dict
assert await adapter.count_tokens([], None) == 0
@pytest.mark.asyncio
async def test_adapter_redacts_provider_errors_and_records_metrics() -> None:
snapshot = resolve_role_model("writer", app_config=_app())