Reuse shared raw request helpers in session request utilities

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

Author: cursoragent

CONTRIBUTING.md

@@ -155,6 +155,7 @@ This runs lint, format checks, compile checks, tests, and package build.
   - `tests/test_session_parse_usage_boundary.py` (centralized session parse-helper usage boundary enforcement),
   - `tests/test_session_profile_update_helper_usage.py` (session profile-update parameter helper usage enforcement),
   - `tests/test_session_request_helper_usage.py` (session manager request-helper usage enforcement),
+  - `tests/test_session_request_internal_reuse.py` (session request-helper internal reuse of shared model raw request helpers),
   - `tests/test_session_route_constants_usage.py` (session manager route-constant usage enforcement),
   - `tests/test_session_upload_helper_usage.py` (session upload-input normalization helper usage enforcement),
   - `tests/test_start_and_wait_default_constants_usage.py` (shared start-and-wait default-constant usage enforcement),

hyperbrowser/client/managers/model_request_utils.py

@@ -9,11 +9,31 @@ def post_model_request(
     *,
     client: Any,
     route_path: str,
-    data: Dict[str, Any],
+    data: Optional[Dict[str, Any]],
     files: Optional[Dict[str, Any]] = None,
     model: Type[T],
     operation_name: str,
 ) -> T:
+    response_data = post_model_response_data(
+        client=client,
+        route_path=route_path,
+        data=data,
+        files=files,
+    )
+    return parse_response_model(
+        response_data,
+        model=model,
+        operation_name=operation_name,
+    )
+
+
+def post_model_response_data(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+    files: Optional[Dict[str, Any]] = None,
+) -> Any:
     if files is None:
         response = client.transport.post(
             client._build_url(route_path),
@@ -25,11 +45,7 @@ def post_model_request(
             data=data,
             files=files,
         )
-    return parse_response_model(
-        response.data,
-        model=model,
-        operation_name=operation_name,
-    )
+    return response.data
 
 
 def get_model_request(
@@ -58,11 +74,17 @@ def get_model_response_data(
     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,
-    )
+    if follow_redirects:
+        response = client.transport.get(
+            client._build_url(route_path),
+            params=params,
+            follow_redirects=True,
+        )
+    else:
+        response = client.transport.get(
+            client._build_url(route_path),
+            params=params,
+        )
     return response.data
 
 
@@ -91,26 +113,60 @@ def put_model_request(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.put(
-        client._build_url(route_path),
+    response_data = put_model_response_data(
+        client=client,
+        route_path=route_path,
         data=data,
     )
     return parse_response_model(
-        response.data,
+        response_data,
         model=model,
         operation_name=operation_name,
     )
 
 
+def put_model_response_data(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+) -> Any:
+    response = client.transport.put(
+        client._build_url(route_path),
+        data=data,
+    )
+    return response.data
+
+
 async def post_model_request_async(
     *,
     client: Any,
     route_path: str,
-    data: Dict[str, Any],
+    data: Optional[Dict[str, Any]],
     files: Optional[Dict[str, Any]] = None,
     model: Type[T],
     operation_name: str,
 ) -> T:
+    response_data = await post_model_response_data_async(
+        client=client,
+        route_path=route_path,
+        data=data,
+        files=files,
+    )
+    return parse_response_model(
+        response_data,
+        model=model,
+        operation_name=operation_name,
+    )
+
+
+async def post_model_response_data_async(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+    files: Optional[Dict[str, Any]] = None,
+) -> Any:
     if files is None:
         response = await client.transport.post(
             client._build_url(route_path),
@@ -122,11 +178,7 @@ async def post_model_request_async(
             data=data,
             files=files,
         )
-    return parse_response_model(
-        response.data,
-        model=model,
-        operation_name=operation_name,
-    )
+    return response.data
 
 
 async def get_model_request_async(
@@ -155,11 +207,17 @@ async def get_model_response_data_async(
     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,
-    )
+    if follow_redirects:
+        response = await client.transport.get(
+            client._build_url(route_path),
+            params=params,
+            follow_redirects=True,
+        )
+    else:
+        response = await client.transport.get(
+            client._build_url(route_path),
+            params=params,
+        )
     return response.data
 
 
@@ -188,17 +246,31 @@ async def put_model_request_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.put(
-        client._build_url(route_path),
+    response_data = await put_model_response_data_async(
+        client=client,
+        route_path=route_path,
         data=data,
     )
     return parse_response_model(
-        response.data,
+        response_data,
         model=model,
         operation_name=operation_name,
     )
 
 
+async def put_model_response_data_async(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+) -> Any:
+    response = await client.transport.put(
+        client._build_url(route_path),
+        data=data,
+    )
+    return response.data
+
+
 def post_model_request_to_endpoint(
     *,
     client: Any,

hyperbrowser/client/managers/session_request_utils.py

@@ -1,5 +1,13 @@
 from typing import Any, Dict, Optional, Type, TypeVar
 
+from .model_request_utils import (
+    get_model_response_data,
+    get_model_response_data_async,
+    post_model_response_data,
+    post_model_response_data_async,
+    put_model_response_data,
+    put_model_response_data_async,
+)
 from .session_utils import (
     parse_session_recordings_response_data,
     parse_session_response_model,
@@ -15,18 +23,12 @@ def post_session_resource(
     data: Optional[Dict[str, Any]] = None,
     files: Optional[Dict[str, Any]] = None,
 ) -> Any:
-    if files is None:
-        response = client.transport.post(
-            client._build_url(route_path),
-            data=data,
-        )
-    else:
-        response = client.transport.post(
-            client._build_url(route_path),
-            data=data,
-            files=files,
-        )
-    return response.data
+    return post_model_response_data(
+        client=client,
+        route_path=route_path,
+        data=data,
+        files=files,
+    )
 
 
 def get_session_resource(
@@ -36,18 +38,12 @@ def get_session_resource(
     params: Optional[Dict[str, Any]] = None,
     follow_redirects: bool = False,
 ) -> Any:
-    if follow_redirects:
-        response = client.transport.get(
-            client._build_url(route_path),
-            params,
-            True,
-        )
-    else:
-        response = client.transport.get(
-            client._build_url(route_path),
-            params=params,
-        )
-    return response.data
+    return get_model_response_data(
+        client=client,
+        route_path=route_path,
+        params=params,
+        follow_redirects=follow_redirects,
+    )
 
 
 def put_session_resource(
@@ -56,11 +52,11 @@ def put_session_resource(
     route_path: str,
     data: Optional[Dict[str, Any]] = None,
 ) -> Any:
-    response = client.transport.put(
-        client._build_url(route_path),
+    return put_model_response_data(
+        client=client,
+        route_path=route_path,
         data=data,
     )
-    return response.data
 
 
 async def post_session_resource_async(
@@ -70,18 +66,12 @@ async def post_session_resource_async(
     data: Optional[Dict[str, Any]] = None,
     files: Optional[Dict[str, Any]] = None,
 ) -> Any:
-    if files is None:
-        response = await client.transport.post(
-            client._build_url(route_path),
-            data=data,
-        )
-    else:
-        response = await client.transport.post(
-            client._build_url(route_path),
-            data=data,
-            files=files,
-        )
-    return response.data
+    return await post_model_response_data_async(
+        client=client,
+        route_path=route_path,
+        data=data,
+        files=files,
+    )
 
 
 async def get_session_resource_async(
@@ -91,18 +81,12 @@ async def get_session_resource_async(
     params: Optional[Dict[str, Any]] = None,
     follow_redirects: bool = False,
 ) -> Any:
-    if follow_redirects:
-        response = await client.transport.get(
-            client._build_url(route_path),
-            params,
-            True,
-        )
-    else:
-        response = await client.transport.get(
-            client._build_url(route_path),
-            params=params,
-        )
-    return response.data
+    return await get_model_response_data_async(
+        client=client,
+        route_path=route_path,
+        params=params,
+        follow_redirects=follow_redirects,
+    )
 
 
 async def put_session_resource_async(
@@ -111,11 +95,11 @@ async def put_session_resource_async(
     route_path: str,
     data: Optional[Dict[str, Any]] = None,
 ) -> Any:
-    response = await client.transport.put(
-        client._build_url(route_path),
+    return await put_model_response_data_async(
+        client=client,
+        route_path=route_path,
         data=data,
     )
-    return response.data
 
 
 def post_session_model(

tests/test_architecture_marker_usage.py

@@ -85,6 +85,7 @@
     "tests/test_schema_injection_helper_usage.py",
     "tests/test_session_operation_metadata_usage.py",
     "tests/test_session_parse_usage_boundary.py",
+    "tests/test_session_request_internal_reuse.py",
     "tests/test_session_route_constants_usage.py",
     "tests/test_session_request_helper_usage.py",
     "tests/test_session_profile_update_helper_usage.py",