Reuse model request helpers in job request utilities

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

Author: cursoragent

CONTRIBUTING.md

@@ -118,6 +118,7 @@ This runs lint, format checks, compile checks, tests, and package build.
   - `tests/test_job_poll_helper_usage.py` (shared terminal-status polling helper usage enforcement),
   - `tests/test_job_query_params_helper_usage.py` (shared scrape/crawl query-param helper usage enforcement),
   - `tests/test_job_request_helper_usage.py` (shared scrape/crawl/extract request-helper usage enforcement),
+  - `tests/test_job_request_internal_reuse.py` (shared job request helper internal reuse of shared model request helpers),
   - `tests/test_job_route_builder_usage.py` (shared job/web request-helper route-builder usage enforcement),
   - `tests/test_job_route_constants_usage.py` (shared scrape/crawl/extract route-constant usage enforcement),
   - `tests/test_job_start_payload_helper_usage.py` (shared scrape/crawl start-payload helper usage enforcement),

hyperbrowser/client/managers/job_request_utils.py

@@ -5,7 +5,14 @@
     build_job_route,
     build_job_status_route,
 )
-from .response_utils import parse_response_model
+from .model_request_utils import (
+    get_model_request,
+    get_model_request_async,
+    post_model_request,
+    post_model_request_async,
+    put_model_request,
+    put_model_request_async,
+)
 
 T = TypeVar("T")
 
@@ -18,12 +25,10 @@ def start_job(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.post(
-        client._build_url(route_prefix),
+    return post_model_request(
+        client=client,
+        route_path=route_prefix,
         data=payload,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )
@@ -37,11 +42,10 @@ def get_job_status(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.get(
-        client._build_url(build_job_status_route(route_prefix, job_id)),
-    )
-    return parse_response_model(
-        response.data,
+    return get_model_request(
+        client=client,
+        route_path=build_job_status_route(route_prefix, job_id),
+        params=None,
         model=model,
         operation_name=operation_name,
     )
@@ -56,12 +60,10 @@ def get_job(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.get(
-        client._build_url(build_job_route(route_prefix, job_id)),
+    return get_model_request(
+        client=client,
+        route_path=build_job_route(route_prefix, job_id),
         params=params,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )
@@ -75,12 +77,10 @@ async def start_job_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.post(
-        client._build_url(route_prefix),
+    return await post_model_request_async(
+        client=client,
+        route_path=route_prefix,
         data=payload,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )
@@ -94,11 +94,10 @@ async def get_job_status_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.get(
-        client._build_url(build_job_status_route(route_prefix, job_id)),
-    )
-    return parse_response_model(
-        response.data,
+    return await get_model_request_async(
+        client=client,
+        route_path=build_job_status_route(route_prefix, job_id),
+        params=None,
         model=model,
         operation_name=operation_name,
     )
@@ -113,12 +112,10 @@ async def get_job_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.get(
-        client._build_url(build_job_route(route_prefix, job_id)),
+    return await get_model_request_async(
+        client=client,
+        route_path=build_job_route(route_prefix, job_id),
         params=params,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )
@@ -133,11 +130,10 @@ def put_job_action(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.put(
-        client._build_url(build_job_action_route(route_prefix, job_id, action_suffix)),
-    )
-    return parse_response_model(
-        response.data,
+    return put_model_request(
+        client=client,
+        route_path=build_job_action_route(route_prefix, job_id, action_suffix),
+        data=None,
         model=model,
         operation_name=operation_name,
     )
@@ -152,11 +148,10 @@ async def put_job_action_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.put(
-        client._build_url(build_job_action_route(route_prefix, job_id, action_suffix)),
-    )
-    return parse_response_model(
-        response.data,
+    return await put_model_request_async(
+        client=client,
+        route_path=build_job_action_route(route_prefix, job_id, action_suffix),
+        data=None,
         model=model,
         operation_name=operation_name,
     )

hyperbrowser/client/managers/model_request_utils.py

@@ -60,6 +60,25 @@ def delete_model_request(
     )
 
 
+def put_model_request(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+    model: Type[T],
+    operation_name: str,
+) -> T:
+    response = client.transport.put(
+        client._build_url(route_path),
+        data=data,
+    )
+    return parse_response_model(
+        response.data,
+        model=model,
+        operation_name=operation_name,
+    )
+
+
 async def post_model_request_async(
     *,
     client: Any,
@@ -113,3 +132,22 @@ async def delete_model_request_async(
         model=model,
         operation_name=operation_name,
     )
+
+
+async def put_model_request_async(
+    *,
+    client: Any,
+    route_path: str,
+    data: Optional[Dict[str, Any]],
+    model: Type[T],
+    operation_name: str,
+) -> T:
+    response = await client.transport.put(
+        client._build_url(route_path),
+        data=data,
+    )
+    return parse_response_model(
+        response.data,
+        model=model,
+        operation_name=operation_name,
+    )

tests/test_architecture_marker_usage.py

@@ -63,6 +63,7 @@
     "tests/test_job_operation_metadata_usage.py",
     "tests/test_job_poll_helper_boundary.py",
     "tests/test_job_poll_helper_usage.py",
+    "tests/test_job_request_internal_reuse.py",
     "tests/test_job_route_builder_usage.py",
     "tests/test_job_route_constants_usage.py",
     "tests/test_job_request_helper_usage.py",

tests/test_job_request_internal_reuse.py

@@ -0,0 +1,20 @@
+from pathlib import Path
+
+import pytest
+
+pytestmark = pytest.mark.architecture
+
+
+def test_job_request_utils_reuse_model_request_helpers():
+    module_text = Path("hyperbrowser/client/managers/job_request_utils.py").read_text(
+        encoding="utf-8"
+    )
+    assert "model_request_utils import" in module_text
+    assert "post_model_request(" in module_text
+    assert "get_model_request(" in module_text
+    assert "put_model_request(" in module_text
+    assert "post_model_request_async(" in module_text
+    assert "get_model_request_async(" in module_text
+    assert "put_model_request_async(" in module_text
+    assert "client.transport." not in module_text
+    assert "parse_response_model(" not in module_text