Reuse shared raw data request helpers in extension list flow

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/managers/extension_request_utils.py

@@ -1,7 +1,12 @@
 from typing import Any, IO, List, Type, TypeVar
 
 from .extension_utils import parse_extension_list_response_data
-from .model_request_utils import post_model_request, post_model_request_async
+from .model_request_utils import (
+    get_model_response_data,
+    get_model_response_data_async,
+    post_model_request,
+    post_model_request_async,
+)
 from hyperbrowser.models.extension import ExtensionResponse
 
 T = TypeVar("T")
@@ -31,10 +36,11 @@ def list_extension_resources(
     client: Any,
     route_path: str,
 ) -> List[ExtensionResponse]:
-    response = client.transport.get(
-        client._build_url(route_path),
+    response_data = get_model_response_data(
+        client=client,
+        route_path=route_path,
     )
-    return parse_extension_list_response_data(response.data)
+    return parse_extension_list_response_data(response_data)
 
 
 async def create_extension_resource_async(
@@ -61,7 +67,8 @@ async def list_extension_resources_async(
     client: Any,
     route_path: str,
 ) -> List[ExtensionResponse]:
-    response = await client.transport.get(
-        client._build_url(route_path),
+    response_data = await get_model_response_data_async(
+        client=client,
+        route_path=route_path,
     )
-    return parse_extension_list_response_data(response.data)
+    return parse_extension_list_response_data(response_data)

hyperbrowser/client/managers/model_request_utils.py

@@ -51,6 +51,21 @@ def get_model_request(
     )
 
 
+def get_model_response_data(
+    *,
+    client: Any,
+    route_path: str,
+    params: Optional[Dict[str, Any]] = None,
+    follow_redirects: bool = False,
+) -> Any:
+    response = client.transport.get(
+        client._build_url(route_path),
+        params=params,
+        follow_redirects=follow_redirects,
+    )
+    return response.data
+
+
 def delete_model_request(
     *,
     client: Any,
@@ -133,6 +148,21 @@ async def get_model_request_async(
     )
 
 
+async def get_model_response_data_async(
+    *,
+    client: Any,
+    route_path: str,
+    params: Optional[Dict[str, Any]] = None,
+    follow_redirects: bool = False,
+) -> Any:
+    response = await client.transport.get(
+        client._build_url(route_path),
+        params=params,
+        follow_redirects=follow_redirects,
+    )
+    return response.data
+
+
 async def delete_model_request_async(
     *,
     client: Any,

tests/test_extension_request_internal_reuse.py

@@ -9,8 +9,10 @@ def test_extension_request_utils_reuse_model_request_helpers():
     module_text = Path(
         "hyperbrowser/client/managers/extension_request_utils.py"
     ).read_text(encoding="utf-8")
-    assert "model_request_utils import post_model_request, post_model_request_async" in module_text
+    assert "model_request_utils import (" in module_text
+    assert "get_model_response_data" in module_text
+    assert "get_model_response_data_async" in module_text
     assert "post_model_request(" in module_text
     assert "post_model_request_async(" in module_text
-    assert "client.transport.post(" not in module_text
+    assert "client.transport." not in module_text
     assert "parse_response_model(" not in module_text

tests/test_extension_request_utils.py

@@ -1,6 +1,5 @@
 import asyncio
 from io import BytesIO
-from types import SimpleNamespace
 
 import hyperbrowser.client.managers.extension_request_utils as extension_request_utils
 
@@ -37,36 +36,31 @@ def _fake_post_model_request(**kwargs):
 def test_list_extension_resources_uses_get_and_extension_parser():
     captured = {}
 
-    class _SyncTransport:
-        def get(self, url):
-            captured["url"] = url
-            return SimpleNamespace(data={"extensions": []})
-
-    class _Client:
-        transport = _SyncTransport()
-
-        @staticmethod
-        def _build_url(path: str) -> str:
-            return f"https://api.example.test{path}"
+    def _fake_get_model_response_data(**kwargs):
+        captured.update(kwargs)
+        return {"extensions": []}
 
     def _fake_parse_extension_list_response_data(data):
         captured["parse_data"] = data
         return ["parsed"]
 
+    original_get_data = extension_request_utils.get_model_response_data
     original_parse = extension_request_utils.parse_extension_list_response_data
+    extension_request_utils.get_model_response_data = _fake_get_model_response_data
     extension_request_utils.parse_extension_list_response_data = (
         _fake_parse_extension_list_response_data
     )
     try:
         result = extension_request_utils.list_extension_resources(
-            client=_Client(),
+            client=object(),
             route_path="/extensions/list",
         )
     finally:
+        extension_request_utils.get_model_response_data = original_get_data
         extension_request_utils.parse_extension_list_response_data = original_parse
 
     assert result == ["parsed"]
-    assert captured["url"] == "https://api.example.test/extensions/list"
+    assert captured["route_path"] == "/extensions/list"
     assert captured["parse_data"] == {"extensions": []}
 
 
@@ -104,36 +98,33 @@ async def _fake_post_model_request_async(**kwargs):
 def test_list_extension_resources_async_uses_get_and_extension_parser():
     captured = {}
 
-    class _AsyncTransport:
-        async def get(self, url):
-            captured["url"] = url
-            return SimpleNamespace(data={"extensions": []})
-
-    class _Client:
-        transport = _AsyncTransport()
-
-        @staticmethod
-        def _build_url(path: str) -> str:
-            return f"https://api.example.test{path}"
+    async def _fake_get_model_response_data_async(**kwargs):
+        captured.update(kwargs)
+        return {"extensions": []}
 
     def _fake_parse_extension_list_response_data(data):
         captured["parse_data"] = data
         return ["parsed"]
 
+    original_get_data = extension_request_utils.get_model_response_data_async
     original_parse = extension_request_utils.parse_extension_list_response_data
+    extension_request_utils.get_model_response_data_async = (
+        _fake_get_model_response_data_async
+    )
     extension_request_utils.parse_extension_list_response_data = (
         _fake_parse_extension_list_response_data
     )
     try:
         result = asyncio.run(
             extension_request_utils.list_extension_resources_async(
-                client=_Client(),
+                client=object(),
                 route_path="/extensions/list",
             )
         )
     finally:
+        extension_request_utils.get_model_response_data_async = original_get_data
         extension_request_utils.parse_extension_list_response_data = original_parse
 
     assert result == ["parsed"]
-    assert captured["url"] == "https://api.example.test/extensions/list"
+    assert captured["route_path"] == "/extensions/list"
     assert captured["parse_data"] == {"extensions": []}

tests/test_model_request_internal_reuse.py

@@ -19,7 +19,7 @@
         "parse_response_model(",
     ),
     "hyperbrowser/client/managers/extension_request_utils.py": (
-        "client.transport.post(",
+        "client.transport.",
         "parse_response_model(",
     ),
     "hyperbrowser/client/managers/job_request_utils.py": (

tests/test_model_request_utils.py

@@ -128,6 +128,36 @@ def _fake_parse_response_model(data, **kwargs):
     assert captured["parse_kwargs"]["operation_name"] == "read resource"
 
 
+def test_get_model_response_data_gets_payload_without_parsing():
+    captured = {}
+
+    class _SyncTransport:
+        def get(self, url, params=None, follow_redirects=False):
+            captured["url"] = url
+            captured["params"] = params
+            captured["follow_redirects"] = follow_redirects
+            return SimpleNamespace(data={"id": "resource-raw"})
+
+    class _Client:
+        transport = _SyncTransport()
+
+        @staticmethod
+        def _build_url(path: str) -> str:
+            return f"https://api.example.test{path}"
+
+    result = model_request_utils.get_model_response_data(
+        client=_Client(),
+        route_path="/resource/raw",
+        params={"page": 1},
+        follow_redirects=True,
+    )
+
+    assert result == {"id": "resource-raw"}
+    assert captured["url"] == "https://api.example.test/resource/raw"
+    assert captured["params"] == {"page": 1}
+    assert captured["follow_redirects"] is True
+
+
 def test_delete_model_request_deletes_resource_and_parses_response():
     captured = {}
 
@@ -296,6 +326,38 @@ def _fake_parse_response_model(data, **kwargs):
     assert captured["parse_kwargs"]["operation_name"] == "read resource"
 
 
+def test_get_model_response_data_async_gets_payload_without_parsing():
+    captured = {}
+
+    class _AsyncTransport:
+        async def get(self, url, params=None, follow_redirects=False):
+            captured["url"] = url
+            captured["params"] = params
+            captured["follow_redirects"] = follow_redirects
+            return SimpleNamespace(data={"id": "resource-raw-async"})
+
+    class _Client:
+        transport = _AsyncTransport()
+
+        @staticmethod
+        def _build_url(path: str) -> str:
+            return f"https://api.example.test{path}"
+
+    result = asyncio.run(
+        model_request_utils.get_model_response_data_async(
+            client=_Client(),
+            route_path="/resource/raw",
+            params={"page": 2},
+            follow_redirects=True,
+        )
+    )
+
+    assert result == {"id": "resource-raw-async"}
+    assert captured["url"] == "https://api.example.test/resource/raw"
+    assert captured["params"] == {"page": 2}
+    assert captured["follow_redirects"] is True
+
+
 def test_delete_model_request_async_deletes_resource_and_parses_response():
     captured = {}