steven_li
4b0bf65ace
feat(engine): 优化智能体循环中的助手消息处理逻辑 - 在没有工具调用时才添加助手消息到上下文 - 确保工具调用响应正确添加到消息上下文中 - 修复了消息构建的条件逻辑 fix(cron): 改进定时任务调度的时间解析功能 - 添加正则表达式导入用于时间显示解析 - 实现从显示文本中提取毫秒间隔的功能 - 增强整数转换的安全性，避免类型错误 - 优化定时任务配置的解析逻辑 feat(outlook): 增强Outlook集成的功能和稳定性 - 将默认超时时间从10秒增加到180秒 - 为状态检查函数添加可选的验证参数 - 串行执行邮件概览获取操作而非并行 - 改进连接状态验证逻辑 feat(channel): 添加设备名称作为会话标识的选项 - 为终端WebSocket适配器添加新的配置选项 - 实现基于设备名称生成会话对等ID的功能 - 记录原始对等ID和设备名称的元数据 - 支持从设备名称创建会话对等ID feat(skills): 完善技能学习评估系统和进度跟踪 - 在应用启动时自动调度待评估的技能草稿 - 为技能评估工作创建独立的循环工厂 - 实现异步技能评估任务的取消和清理机制 - 添加技能评估进度报告和状态跟踪功能 - 扩展会话列表API以包含更多详细信息 - 防止对不存在的会话进行操作 - 优化技能草稿提交和评估的业务逻辑 perf(skills): 提升技能评估的并发性能 - 实现并行技能案例评估以提高效率 - 添加最大并行案例数的环境变量控制 - 实现实时评估进度更新和回调机制 - 优化评估过程中的资源管理和同步 refactor(services): 创建隔离的智能体循环实例 - 添加创建独立智能体循环的工厂方法 - 确保新循环继承运行时服务配置 - 支持技能评估等需要隔离环境的场景 ```
113 lines
3.5 KiB
Python
113 lines
3.5 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json
|
|
|
|
from beaver.tools.builtins import web
|
|
|
|
|
|
class _FakeResponse:
|
|
headers = {"content-type": "text/html"}
|
|
status_code = 200
|
|
|
|
def __init__(self, url: str = "https://example.com") -> None:
|
|
self.url = url
|
|
if "duckduckgo.com" in url:
|
|
self.text = '<a class="result__a" href="https://duck.example.com">Duck Example</a>'
|
|
else:
|
|
self.text = (
|
|
'<li class="b_algo"><h2><a href="https://example.com">Example</a></h2>'
|
|
"<p>Example result</p></li>"
|
|
)
|
|
|
|
def raise_for_status(self) -> None:
|
|
return None
|
|
|
|
|
|
class _FakeAsyncClient:
|
|
calls: list[dict[str, object]] = []
|
|
urls: list[str] = []
|
|
fail_bing = False
|
|
|
|
def __init__(self, **kwargs: object) -> None:
|
|
self.calls.append(kwargs)
|
|
|
|
async def __aenter__(self) -> "_FakeAsyncClient":
|
|
return self
|
|
|
|
async def __aexit__(self, *args: object) -> None:
|
|
return None
|
|
|
|
async def get(self, *args: object, **kwargs: object) -> _FakeResponse:
|
|
url = str(args[0])
|
|
self.urls.append(url)
|
|
if self.fail_bing and "bing.com" in url:
|
|
raise web.httpx.ConnectTimeout("bing unavailable")
|
|
return _FakeResponse(url)
|
|
|
|
|
|
def test_web_tools_use_environment_proxy_settings(monkeypatch) -> None:
|
|
_FakeAsyncClient.calls = []
|
|
monkeypatch.setattr(web.httpx, "AsyncClient", _FakeAsyncClient)
|
|
|
|
async def _run() -> None:
|
|
await web.WebFetchTool().execute(url="https://example.com")
|
|
await web.WebSearchTool().execute(query="example")
|
|
|
|
asyncio.run(_run())
|
|
|
|
assert [call.get("trust_env") for call in _FakeAsyncClient.calls] == [True, True]
|
|
|
|
|
|
def test_web_fetch_uses_short_connect_timeout(monkeypatch) -> None:
|
|
_FakeAsyncClient.calls = []
|
|
_FakeAsyncClient.urls = []
|
|
_FakeAsyncClient.fail_bing = False
|
|
monkeypatch.setattr(web.httpx, "AsyncClient", _FakeAsyncClient)
|
|
|
|
asyncio.run(web.WebFetchTool().execute(url="https://example.com"))
|
|
|
|
timeout = _FakeAsyncClient.calls[0]["timeout"]
|
|
assert isinstance(timeout, web.httpx.Timeout)
|
|
assert timeout.connect == 5
|
|
assert timeout.read == 12
|
|
|
|
|
|
def test_web_search_uses_reachable_bing_endpoint_first(monkeypatch) -> None:
|
|
_FakeAsyncClient.calls = []
|
|
_FakeAsyncClient.urls = []
|
|
_FakeAsyncClient.fail_bing = False
|
|
monkeypatch.setattr(web.httpx, "AsyncClient", _FakeAsyncClient)
|
|
|
|
raw = asyncio.run(web.WebSearchTool().execute(query="weather beijing"))
|
|
|
|
payload = json.loads(raw)
|
|
assert payload["success"] is True
|
|
assert payload["engine"] in {"bing", "duckduckgo"}
|
|
assert set(_FakeAsyncClient.urls) == {
|
|
"https://www.bing.com/search?q=weather+beijing",
|
|
"https://duckduckgo.com/html/?q=weather+beijing",
|
|
}
|
|
|
|
timeout = _FakeAsyncClient.calls[0]["timeout"]
|
|
assert isinstance(timeout, web.httpx.Timeout)
|
|
assert timeout.connect == 5
|
|
assert timeout.read == 8
|
|
|
|
|
|
def test_web_search_falls_back_when_bing_is_unavailable(monkeypatch) -> None:
|
|
_FakeAsyncClient.calls = []
|
|
_FakeAsyncClient.urls = []
|
|
_FakeAsyncClient.fail_bing = True
|
|
monkeypatch.setattr(web.httpx, "AsyncClient", _FakeAsyncClient)
|
|
|
|
raw = asyncio.run(web.WebSearchTool().execute(query="weather beijing"))
|
|
|
|
payload = json.loads(raw)
|
|
assert payload["success"] is True
|
|
assert payload["engine"] == "duckduckgo"
|
|
assert set(_FakeAsyncClient.urls) == {
|
|
"https://www.bing.com/search?q=weather+beijing",
|
|
"https://duckduckgo.com/html/?q=weather+beijing",
|
|
}
|