Patch VCR aiohttp stub to work with latest google-genai

Author: DouweM

tests/conftest.py

@@ -10,6 +10,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
+from functools import cached_property
 from pathlib import Path
 from types import ModuleType
 from typing import TYPE_CHECKING, Any, Callable
@@ -20,6 +21,7 @@
 from pytest_mock import MockerFixture
 from typing_extensions import TypeAlias
 from vcr import VCR, request as vcr_request
+from vcr.stubs import aiohttp_stubs
 
 import pydantic_ai.models
 from pydantic_ai.messages import BinaryContent
@@ -201,6 +203,18 @@ def method_matcher(r1: vcr_request.Request, r2: vcr_request.Request) -> None:
     vcr.register_matcher('method', method_matcher)
 
 
+@pytest.fixture(autouse=True)
+def mock_vcr_aiohttp_content(mocker: MockerFixture):
+    # google-genai calls `self.response_stream.content.readline()` where `self.response_stream` is a `MockClientResponse`,
+    # which creates a new `MockStream` each time instead of returning the same one, resulting in the readline cursor not being respected.
+    # So we turn `content` into a cached property to return the same one each time.
+    # VCR issue: https://github.com/kevin1024/vcrpy/issues/927. Once that's is resolved, we can remove this patch.
+    cached_content = cached_property(aiohttp_stubs.MockClientResponse.content.fget)  # type: ignore
+    cached_content.__set_name__(aiohttp_stubs.MockClientResponse, 'content')
+    mocker.patch('vcr.stubs.aiohttp_stubs.MockClientResponse.content', new=cached_content)
+    mocker.patch('vcr.stubs.aiohttp_stubs.MockStream.set_exception', return_value=None)
+
+
 @pytest.fixture(scope='module')
 def vcr_config():
     return {