Reuse shared job request helpers in web request utilities

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

Author: cursoragent

CONTRIBUTING.md

@@ -161,6 +161,7 @@ This runs lint, format checks, compile checks, tests, and package build.
   - `tests/test_web_pagination_internal_reuse.py` (web pagination helper internal reuse of shared job pagination helpers),
   - `tests/test_web_payload_helper_usage.py` (web manager payload-helper usage enforcement),
   - `tests/test_web_request_helper_usage.py` (web manager request-helper usage enforcement),
+  - `tests/test_web_request_internal_reuse.py` (web request helper internal reuse of shared job request helpers),
   - `tests/test_web_route_constants_usage.py` (web manager route-constant usage enforcement).
 
 ## Code quality conventions

hyperbrowser/client/managers/web_request_utils.py

@@ -1,7 +1,13 @@
 from typing import Any, Dict, Optional, Type, TypeVar
 
-from .job_route_builders import build_job_route, build_job_status_route
-from .response_utils import parse_response_model
+from .job_request_utils import (
+    get_job,
+    get_job_async,
+    get_job_status,
+    get_job_status_async,
+    start_job,
+    start_job_async,
+)
 
 T = TypeVar("T")
 
@@ -14,12 +20,10 @@ def start_web_job(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.post(
-        client._build_url(route_prefix),
-        data=payload,
-    )
-    return parse_response_model(
-        response.data,
+    return start_job(
+        client=client,
+        route_prefix=route_prefix,
+        payload=payload,
         model=model,
         operation_name=operation_name,
     )
@@ -33,11 +37,10 @@ def get_web_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_job_status(
+        client=client,
+        route_prefix=route_prefix,
+        job_id=job_id,
         model=model,
         operation_name=operation_name,
     )
@@ -52,12 +55,11 @@ def get_web_job(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = client.transport.get(
-        client._build_url(build_job_route(route_prefix, job_id)),
+    return get_job(
+        client=client,
+        route_prefix=route_prefix,
+        job_id=job_id,
         params=params,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )
@@ -71,12 +73,10 @@ async def start_web_job_async(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    response = await client.transport.post(
-        client._build_url(route_prefix),
-        data=payload,
-    )
-    return parse_response_model(
-        response.data,
+    return await start_job_async(
+        client=client,
+        route_prefix=route_prefix,
+        payload=payload,
         model=model,
         operation_name=operation_name,
     )
@@ -90,11 +90,10 @@ async def get_web_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_job_status_async(
+        client=client,
+        route_prefix=route_prefix,
+        job_id=job_id,
         model=model,
         operation_name=operation_name,
     )
@@ -109,12 +108,11 @@ async def get_web_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_job_async(
+        client=client,
+        route_prefix=route_prefix,
+        job_id=job_id,
         params=params,
-    )
-    return parse_response_model(
-        response.data,
         model=model,
         operation_name=operation_name,
     )

tests/test_architecture_marker_usage.py

@@ -90,6 +90,7 @@
     "tests/test_web_pagination_internal_reuse.py",
     "tests/test_web_payload_helper_usage.py",
     "tests/test_web_fetch_search_usage.py",
+    "tests/test_web_request_internal_reuse.py",
     "tests/test_web_request_helper_usage.py",
     "tests/test_web_route_constants_usage.py",
 )

tests/test_job_route_builder_usage.py

@@ -5,17 +5,28 @@
 pytestmark = pytest.mark.architecture
 
 
-MODULES = (
-    "hyperbrowser/client/managers/job_request_utils.py",
-    "hyperbrowser/client/managers/web_request_utils.py",
-)
+def test_job_request_helpers_use_route_builders():
+    module_text = Path("hyperbrowser/client/managers/job_request_utils.py").read_text(
+        encoding="utf-8"
+    )
+    assert (
+        "job_route_builders import build_job_route, build_job_status_route"
+        in module_text
+    )
+    assert "build_job_route(route_prefix, job_id)" in module_text
+    assert "build_job_status_route(route_prefix, job_id)" in module_text
+    assert 'f"{route_prefix}/{job_id}"' not in module_text
+    assert 'f"{route_prefix}/{job_id}/status"' not in module_text
 
 
-def test_job_and_web_request_helpers_use_route_builders():
-    for module_path in MODULES:
-        module_text = Path(module_path).read_text(encoding="utf-8")
-        assert "job_route_builders import build_job_route, build_job_status_route" in module_text
-        assert "build_job_route(route_prefix, job_id)" in module_text
-        assert "build_job_status_route(route_prefix, job_id)" in module_text
-        assert 'f"{route_prefix}/{job_id}"' not in module_text
-        assert 'f"{route_prefix}/{job_id}/status"' not in module_text
+def test_web_request_helpers_reuse_job_request_helpers():
+    module_text = Path("hyperbrowser/client/managers/web_request_utils.py").read_text(
+        encoding="utf-8"
+    )
+    assert "job_request_utils import" in module_text
+    assert "start_job(" in module_text
+    assert "get_job_status(" in module_text
+    assert "get_job(" in module_text
+    assert "start_job_async(" in module_text
+    assert "get_job_status_async(" in module_text
+    assert "get_job_async(" in module_text

tests/test_web_request_internal_reuse.py

@@ -0,0 +1,20 @@
+from pathlib import Path
+
+import pytest
+
+pytestmark = pytest.mark.architecture
+
+
+def test_web_request_utils_reuse_job_request_helpers():
+    module_text = Path("hyperbrowser/client/managers/web_request_utils.py").read_text(
+        encoding="utf-8"
+    )
+    assert "job_request_utils import" in module_text
+    assert "start_job(" in module_text
+    assert "get_job_status(" in module_text
+    assert "get_job(" in module_text
+    assert "start_job_async(" in module_text
+    assert "get_job_status_async(" in module_text
+    assert "get_job_async(" in module_text
+    assert "client.transport." not in module_text
+    assert "parse_response_model(" not in module_text