Centralize fetch operation naming for paginated jobs

cursoragent · shrisukhani · cursoragent · commit 8658934655f2 · 2026-02-14T12:44:39.000Z
Co-authored-by: Shri Sukhani &lt;shrisukhani@users.noreply.github.com&gt;
diff --git a/hyperbrowser/client/managers/async_manager/crawl.py b/hyperbrowser/client/managers/async_manager/crawl.py
@@ -2,12 +2,11 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status_async,
 )
 from ..job_fetch_utils import (
     collect_paginated_results_with_defaults_async,
-    retry_operation_with_defaults_async,
+    fetch_job_result_with_defaults_async,
 )
 from ..page_params_utils import build_page_batch_params
 from ..job_pagination_utils import (
@@ -99,9 +98,9 @@ async def start_and_wait(
         )
 
         if not return_all_pages:
-            return await retry_operation_with_defaults_async(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return await fetch_job_result_with_defaults_async(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_job_paginated_response(
diff --git a/hyperbrowser/client/managers/async_manager/scrape.py b/hyperbrowser/client/managers/async_manager/scrape.py
@@ -2,12 +2,11 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status_async,
 )
 from ..job_fetch_utils import (
     collect_paginated_results_with_defaults_async,
-    retry_operation_with_defaults_async,
+    fetch_job_result_with_defaults_async,
 )
 from ..page_params_utils import build_page_batch_params
 from ..job_pagination_utils import (
@@ -109,9 +108,9 @@ async def start_and_wait(
         )
 
         if not return_all_pages:
-            return await retry_operation_with_defaults_async(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return await fetch_job_result_with_defaults_async(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_job_paginated_response(
diff --git a/hyperbrowser/client/managers/async_manager/web/batch_fetch.py b/hyperbrowser/client/managers/async_manager/web/batch_fetch.py
@@ -18,10 +18,9 @@
 )
 from ...job_fetch_utils import (
     collect_paginated_results_with_defaults_async,
-    retry_operation_with_defaults_async,
+    fetch_job_result_with_defaults_async,
 )
 from ....polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status_async,
 )
 from ...response_utils import parse_response_model
@@ -96,9 +95,9 @@ async def start_and_wait(
         )
 
         if not return_all_pages:
-            return await retry_operation_with_defaults_async(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return await fetch_job_result_with_defaults_async(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_paginated_job_response(
diff --git a/hyperbrowser/client/managers/async_manager/web/crawl.py b/hyperbrowser/client/managers/async_manager/web/crawl.py
@@ -18,10 +18,9 @@
 )
 from ...job_fetch_utils import (
     collect_paginated_results_with_defaults_async,
-    retry_operation_with_defaults_async,
+    fetch_job_result_with_defaults_async,
 )
 from ....polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status_async,
 )
 from ...response_utils import parse_response_model
@@ -94,9 +93,9 @@ async def start_and_wait(
         )
 
         if not return_all_pages:
-            return await retry_operation_with_defaults_async(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return await fetch_job_result_with_defaults_async(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_paginated_job_response(
diff --git a/hyperbrowser/client/managers/job_fetch_utils.py b/hyperbrowser/client/managers/job_fetch_utils.py
@@ -3,6 +3,7 @@
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 
 from ..polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     collect_paginated_results_async,
     retry_operation,
@@ -39,6 +40,28 @@ async def retry_operation_with_defaults_async(
     )
 
 
+def fetch_job_result_with_defaults(
+    *,
+    operation_name: str,
+    fetch_result: Callable[[], T],
+) -> T:
+    return retry_operation_with_defaults(
+        operation_name=build_fetch_operation_name(operation_name),
+        operation=fetch_result,
+    )
+
+
+async def fetch_job_result_with_defaults_async(
+    *,
+    operation_name: str,
+    fetch_result: Callable[[], Awaitable[T]],
+) -> T:
+    return await retry_operation_with_defaults_async(
+        operation_name=build_fetch_operation_name(operation_name),
+        operation=fetch_result,
+    )
+
+
 def collect_paginated_results_with_defaults(
     *,
     operation_name: str,
diff --git a/hyperbrowser/client/managers/sync_manager/crawl.py b/hyperbrowser/client/managers/sync_manager/crawl.py
@@ -2,12 +2,11 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status,
 )
 from ..job_fetch_utils import (
     collect_paginated_results_with_defaults,
-    retry_operation_with_defaults,
+    fetch_job_result_with_defaults,
 )
 from ..page_params_utils import build_page_batch_params
 from ..job_pagination_utils import (
@@ -99,9 +98,9 @@ def start_and_wait(
         )
 
         if not return_all_pages:
-            return retry_operation_with_defaults(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return fetch_job_result_with_defaults(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_job_paginated_response(
diff --git a/hyperbrowser/client/managers/sync_manager/scrape.py b/hyperbrowser/client/managers/sync_manager/scrape.py
@@ -2,12 +2,11 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status,
 )
 from ..job_fetch_utils import (
     collect_paginated_results_with_defaults,
-    retry_operation_with_defaults,
+    fetch_job_result_with_defaults,
 )
 from ..page_params_utils import build_page_batch_params
 from ..job_pagination_utils import (
@@ -107,9 +106,9 @@ def start_and_wait(
         )
 
         if not return_all_pages:
-            return retry_operation_with_defaults(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return fetch_job_result_with_defaults(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_job_paginated_response(
diff --git a/hyperbrowser/client/managers/sync_manager/web/batch_fetch.py b/hyperbrowser/client/managers/sync_manager/web/batch_fetch.py
@@ -18,10 +18,9 @@
 )
 from ...job_fetch_utils import (
     collect_paginated_results_with_defaults,
-    retry_operation_with_defaults,
+    fetch_job_result_with_defaults,
 )
 from ....polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status,
 )
 from ...response_utils import parse_response_model
@@ -94,9 +93,9 @@ def start_and_wait(
         )
 
         if not return_all_pages:
-            return retry_operation_with_defaults(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return fetch_job_result_with_defaults(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_paginated_job_response(
diff --git a/hyperbrowser/client/managers/sync_manager/web/crawl.py b/hyperbrowser/client/managers/sync_manager/web/crawl.py
@@ -18,10 +18,9 @@
 )
 from ...job_fetch_utils import (
     collect_paginated_results_with_defaults,
-    retry_operation_with_defaults,
+    fetch_job_result_with_defaults,
 )
 from ....polling import (
-    build_fetch_operation_name,
     poll_until_terminal_status,
 )
 from ...response_utils import parse_response_model
@@ -94,9 +93,9 @@ def start_and_wait(
         )
 
         if not return_all_pages:
-            return retry_operation_with_defaults(
-                operation_name=build_fetch_operation_name(operation_name),
-                operation=lambda: self.get(job_id),
+            return fetch_job_result_with_defaults(
+                operation_name=operation_name,
+                fetch_result=lambda: self.get(job_id),
             )
 
         job_response = initialize_paginated_job_response(
diff --git a/tests/test_job_fetch_helper_boundary.py b/tests/test_job_fetch_helper_boundary.py
@@ -19,6 +19,7 @@ def test_retry_and_paginated_fetch_primitives_are_centralized():
             or "retry_operation_async(" in module_text
             or "collect_paginated_results(" in module_text
             or "collect_paginated_results_async(" in module_text
+            or "build_fetch_operation_name(" in module_text
         ):
             violating_modules.append(module_path.as_posix())
 
diff --git a/tests/test_job_fetch_helper_usage.py b/tests/test_job_fetch_helper_usage.py
@@ -23,20 +23,22 @@
 def test_sync_managers_use_job_fetch_helpers_with_defaults():
     for module_path in SYNC_MODULES:
         module_text = Path(module_path).read_text(encoding="utf-8")
-        assert "retry_operation_with_defaults(" in module_text
+        assert "fetch_job_result_with_defaults(" in module_text
         assert "collect_paginated_results_with_defaults(" in module_text
         assert "retry_operation(" not in module_text
         assert "collect_paginated_results(" not in module_text
+        assert "build_fetch_operation_name(" not in module_text
         assert "max_attempts=POLLING_ATTEMPTS" not in module_text
         assert "retry_delay_seconds=0.5" not in module_text
 
 
 def test_async_managers_use_job_fetch_helpers_with_defaults():
     for module_path in ASYNC_MODULES:
         module_text = Path(module_path).read_text(encoding="utf-8")
-        assert "retry_operation_with_defaults_async(" in module_text
+        assert "fetch_job_result_with_defaults_async(" in module_text
         assert "collect_paginated_results_with_defaults_async(" in module_text
         assert "retry_operation_async(" not in module_text
         assert "collect_paginated_results_async(" not in module_text
+        assert "build_fetch_operation_name(" not in module_text
         assert "max_attempts=POLLING_ATTEMPTS" not in module_text
         assert "retry_delay_seconds=0.5" not in module_text
diff --git a/tests/test_job_fetch_utils.py b/tests/test_job_fetch_utils.py
@@ -111,3 +111,51 @@ async def _fake_collect_paginated_results_async(**kwargs):
     assert captured_kwargs["max_wait_seconds"] == 25.0
     assert captured_kwargs["max_attempts"] == job_fetch_utils.POLLING_ATTEMPTS
     assert captured_kwargs["retry_delay_seconds"] == 0.5
+
+
+def test_fetch_job_result_with_defaults_uses_fetch_operation_name() -> None:
+    captured_kwargs = {}
+
+    def _fake_retry_operation_with_defaults(**kwargs):
+        nonlocal captured_kwargs
+        captured_kwargs = kwargs
+        return {"ok": True}
+
+    original_retry = job_fetch_utils.retry_operation_with_defaults
+    job_fetch_utils.retry_operation_with_defaults = _fake_retry_operation_with_defaults
+    try:
+        result = job_fetch_utils.fetch_job_result_with_defaults(
+            operation_name="crawl job abc",
+            fetch_result=lambda: {"payload": True},
+        )
+    finally:
+        job_fetch_utils.retry_operation_with_defaults = original_retry
+
+    assert result == {"ok": True}
+    assert captured_kwargs["operation_name"] == "Fetching crawl job abc"
+
+
+def test_fetch_job_result_with_defaults_async_uses_fetch_operation_name() -> None:
+    captured_kwargs = {}
+
+    async def _fake_retry_operation_with_defaults_async(**kwargs):
+        nonlocal captured_kwargs
+        captured_kwargs = kwargs
+        return {"ok": True}
+
+    original_retry = job_fetch_utils.retry_operation_with_defaults_async
+    job_fetch_utils.retry_operation_with_defaults_async = (
+        _fake_retry_operation_with_defaults_async
+    )
+    try:
+        result = asyncio.run(
+            job_fetch_utils.fetch_job_result_with_defaults_async(
+                operation_name="crawl job abc",
+                fetch_result=lambda: asyncio.sleep(0, result={"payload": True}),
+            )
+        )
+    finally:
+        job_fetch_utils.retry_operation_with_defaults_async = original_retry
+
+    assert result == {"ok": True}
+    assert captured_kwargs["operation_name"] == "Fetching crawl job abc"
diff --git a/tests/test_manager_operation_name_bounds.py b/tests/test_manager_operation_name_bounds.py

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,11 @@`
`2`	`2`
`3`	`3`	`from hyperbrowser.models.consts import POLLING_ATTEMPTS`
`4`	`4`	`from ...polling import (`
`5`		`- build_fetch_operation_name,`
`6`	`5`	`poll_until_terminal_status_async,`
`7`	`6`	`)`
`8`	`7`	`from ..job_fetch_utils import (`
`9`	`8`	`collect_paginated_results_with_defaults_async,`
`10`		`- retry_operation_with_defaults_async,`
	`9`	`+ fetch_job_result_with_defaults_async,`
`11`	`10`	`)`
`12`	`11`	`from ..page_params_utils import build_page_batch_params`
`13`	`12`	`from ..job_pagination_utils import (`
`@@ -99,9 +98,9 @@ async def start_and_wait(`
`99`	`98`	`)`
`100`	`99`
`101`	`100`	`if not return_all_pages:`
`102`		`- return await retry_operation_with_defaults_async(`
`103`		`- operation_name=build_fetch_operation_name(operation_name),`
`104`		`- operation=lambda: self.get(job_id),`
	`101`	`+ return await fetch_job_result_with_defaults_async(`
	`102`	`+ operation_name=operation_name,`
	`103`	`+ fetch_result=lambda: self.get(job_id),`
`105`	`104`	`)`
`106`	`105`
`107`	`106`	`job_response = initialize_job_paginated_response(`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,9 @@`
`18`	`18`	`)`
`19`	`19`	`from ...job_fetch_utils import (`
`20`	`20`	`collect_paginated_results_with_defaults_async,`
`21`		`- retry_operation_with_defaults_async,`
	`21`	`+ fetch_job_result_with_defaults_async,`
`22`	`22`	`)`
`23`	`23`	`from ....polling import (`
`24`		`- build_fetch_operation_name,`
`25`	`24`	`poll_until_terminal_status_async,`
`26`	`25`	`)`
`27`	`26`	`from ...response_utils import parse_response_model`
`@@ -96,9 +95,9 @@ async def start_and_wait(`
`96`	`95`	`)`
`97`	`96`
`98`	`97`	`if not return_all_pages:`
`99`		`- return await retry_operation_with_defaults_async(`
`100`		`- operation_name=build_fetch_operation_name(operation_name),`
`101`		`- operation=lambda: self.get(job_id),`
	`98`	`+ return await fetch_job_result_with_defaults_async(`
	`99`	`+ operation_name=operation_name,`
	`100`	`+ fetch_result=lambda: self.get(job_id),`
`102`	`101`	`)`
`103`	`102`
`104`	`103`	`job_response = initialize_paginated_job_response(`