Merge pull request #958 from ottercoconut/agent/fix-xhs-raw-response-errors

fix(xhs): 在返回原始 HTML 前识别访问限制
2026-09-29 03:28:12 +08:00 · 2026-08-11 18:00:22 +08:00
parent 7fd42cf448 508abc504f
commit 3c25521bbb
3 changed files with 250 additions and 5 deletions
@@ -0,0 +1,192 @@
+# -*- coding: utf-8 -*-
+
+import json
+from unittest.mock import AsyncMock, Mock
+
+import httpx
+import pytest
+from tenacity import RetryError
+
+from media_platform.xhs.client import XiaoHongShuClient
+from media_platform.xhs.exception import IPBlockError, PlatformAccessError
+
+
+class FakeAsyncClient:
+    def __init__(self, request_impl):
+        self.request_impl = request_impl
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc, traceback):
+        return False
+
+    async def request(self, *args, **kwargs):
+        return await self.request_impl(*args, **kwargs)
+
+
+def make_client():
+    client = XiaoHongShuClient(
+        headers={"Cookie": "web_session=test"},
+        playwright_page=object(),
+        cookie_dict={},
+    )
+    client._refresh_proxy_if_expired = AsyncMock()
+    return client
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("status_code", [401, 403, 429])
+async def test_raw_response_rejects_access_http_status(monkeypatch, status_code):
+    calls = 0
+
+    async def request_impl(method, url, **kwargs):
+        nonlocal calls
+        calls += 1
+        return httpx.Response(
+            status_code,
+            text="blocked",
+            request=httpx.Request(method, url),
+        )
+
+    monkeypatch.setattr(
+        "media_platform.xhs.client.make_async_client",
+        lambda **kwargs: FakeAsyncClient(request_impl),
+    )
+
+    with pytest.raises(PlatformAccessError):
+        await make_client().request(
+            "GET", "https://www.xiaohongshu.com/user/profile/test", return_response=True
+        )
+
+    assert calls == 1
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("code", "expected_exception", "return_response"),
+    [
+        (300011, PlatformAccessError, True),
+        ("300011", PlatformAccessError, False),
+        (300012, IPBlockError, True),
+        ("300012", IPBlockError, False),
+    ],
+)
+async def test_raw_response_rejects_known_business_block(
+    monkeypatch, code, expected_exception, return_response
+):
+    calls = 0
+
+    async def request_impl(method, url, **kwargs):
+        nonlocal calls
+        calls += 1
+        return httpx.Response(
+            200,
+            json={"success": False, "code": code, "msg": "blocked"},
+            request=httpx.Request(method, url),
+        )
+
+    monkeypatch.setattr(
+        "media_platform.xhs.client.make_async_client",
+        lambda **kwargs: FakeAsyncClient(request_impl),
+    )
+
+    with pytest.raises(expected_exception):
+        await make_client().request(
+            "GET",
+            "https://www.xiaohongshu.com/explore/test",
+            return_response=return_response,
+        )
+
+    assert calls == 1
+
+
+@pytest.mark.asyncio
+async def test_raw_response_keeps_successful_html(monkeypatch):
+    async def request_impl(method, url, **kwargs):
+        return httpx.Response(
+            200,
+            text="<html>ok</html>",
+            request=httpx.Request(method, url),
+        )
+
+    monkeypatch.setattr(
+        "media_platform.xhs.client.make_async_client",
+        lambda **kwargs: FakeAsyncClient(request_impl),
+    )
+
+    result = await make_client().request(
+        "GET", "https://www.xiaohongshu.com/explore/test", return_response=True
+    )
+
+    assert result == "<html>ok</html>"
+
+
+@pytest.mark.asyncio
+async def test_successful_json_keeps_raw_and_parsed_return_modes(monkeypatch):
+    calls = 0
+
+    async def request_impl(method, url, **kwargs):
+        nonlocal calls
+        calls += 1
+        return httpx.Response(
+            200,
+            json={"success": True, "data": {"id": "test"}},
+            request=httpx.Request(method, url),
+        )
+
+    monkeypatch.setattr(
+        "media_platform.xhs.client.make_async_client",
+        lambda **kwargs: FakeAsyncClient(request_impl),
+    )
+    client = make_client()
+
+    raw_result = await client.request(
+        "GET", "https://www.xiaohongshu.com/explore/test", return_response=True
+    )
+    parsed_result = await client.request(
+        "GET", "https://edith.xiaohongshu.com/api/test"
+    )
+
+    assert json.loads(raw_result) == {"success": True, "data": {"id": "test"}}
+    assert parsed_result == {"id": "test"}
+    assert calls == 2
+
+
+@pytest.mark.asyncio
+async def test_html_detail_does_not_multiply_transport_retries(monkeypatch):
+    calls = 0
+
+    async def request_impl(method, url, **kwargs):
+        nonlocal calls
+        calls += 1
+        raise httpx.ReadTimeout("timed out", request=httpx.Request(method, url))
+
+    monkeypatch.setattr(
+        "media_platform.xhs.client.make_async_client",
+        lambda **kwargs: FakeAsyncClient(request_impl),
+    )
+
+    with pytest.raises(RetryError):
+        await make_client().get_note_by_id_from_html(
+            "test", xsec_source="pc_search", xsec_token="token"
+        )
+
+    assert calls == 3
+
+
+@pytest.mark.asyncio
+async def test_html_detail_still_retries_parse_failures():
+    client = make_client()
+    client.request = AsyncMock(return_value="<html>incomplete</html>")
+    client._extractor.extract_note_detail_from_html = Mock(
+        side_effect=ValueError("incomplete initial state")
+    )
+
+    with pytest.raises(RetryError):
+        await client.get_note_by_id_from_html(
+            "test", xsec_source="pc_search", xsec_token="token"
+        )
+
+    assert client.request.await_count == 3
+    assert client._extractor.extract_note_detail_from_html.call_count == 3