Use bounded fetch operation names across manager wait paths

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

Author: cursoragent

hyperbrowser/client/managers/async_manager/crawl.py

@@ -2,6 +2,7 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
+    build_fetch_operation_name,
     collect_paginated_results_async,
     poll_until_terminal_status_async,
     retry_operation_async,
@@ -67,7 +68,7 @@ async def start_and_wait(
 
         if not return_all_pages:
             return await retry_operation_async(
-                operation_name=f"Fetching crawl job {job_id}",
+                operation_name=build_fetch_operation_name(f"crawl job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/async_manager/scrape.py

@@ -2,6 +2,7 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
+    build_fetch_operation_name,
     collect_paginated_results_async,
     poll_until_terminal_status_async,
     retry_operation_async,
@@ -74,7 +75,7 @@ async def start_and_wait(
 
         if not return_all_pages:
             return await retry_operation_async(
-                operation_name=f"Fetching batch scrape job {job_id}",
+                operation_name=build_fetch_operation_name(f"batch scrape job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/async_manager/web/batch_fetch.py

@@ -10,6 +10,7 @@
 )
 from hyperbrowser.exceptions import HyperbrowserError
 from ....polling import (
+    build_fetch_operation_name,
     collect_paginated_results_async,
     poll_until_terminal_status_async,
     retry_operation_async,
@@ -75,7 +76,7 @@ async def start_and_wait(
 
         if not return_all_pages:
             return await retry_operation_async(
-                operation_name=f"Fetching batch fetch job {job_id}",
+                operation_name=build_fetch_operation_name(f"batch fetch job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/async_manager/web/crawl.py

@@ -10,6 +10,7 @@
 )
 from hyperbrowser.exceptions import HyperbrowserError
 from ....polling import (
+    build_fetch_operation_name,
     collect_paginated_results_async,
     poll_until_terminal_status_async,
     retry_operation_async,
@@ -73,7 +74,7 @@ async def start_and_wait(
 
         if not return_all_pages:
             return await retry_operation_async(
-                operation_name=f"Fetching web crawl job {job_id}",
+                operation_name=build_fetch_operation_name(f"web crawl job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/sync_manager/crawl.py

@@ -2,6 +2,7 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     poll_until_terminal_status,
     retry_operation,
@@ -67,7 +68,7 @@ def start_and_wait(
 
         if not return_all_pages:
             return retry_operation(
-                operation_name=f"Fetching crawl job {job_id}",
+                operation_name=build_fetch_operation_name(f"crawl job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/sync_manager/scrape.py

@@ -2,6 +2,7 @@
 
 from hyperbrowser.models.consts import POLLING_ATTEMPTS
 from ...polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     poll_until_terminal_status,
     retry_operation,
@@ -72,7 +73,7 @@ def start_and_wait(
 
         if not return_all_pages:
             return retry_operation(
-                operation_name=f"Fetching batch scrape job {job_id}",
+                operation_name=build_fetch_operation_name(f"batch scrape job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/sync_manager/web/batch_fetch.py

@@ -10,6 +10,7 @@
 )
 from hyperbrowser.exceptions import HyperbrowserError
 from ....polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     poll_until_terminal_status,
     retry_operation,
@@ -73,7 +74,7 @@ def start_and_wait(
 
         if not return_all_pages:
             return retry_operation(
-                operation_name=f"Fetching batch fetch job {job_id}",
+                operation_name=build_fetch_operation_name(f"batch fetch job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/managers/sync_manager/web/crawl.py

@@ -10,6 +10,7 @@
 )
 from hyperbrowser.exceptions import HyperbrowserError
 from ....polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     poll_until_terminal_status,
     retry_operation,
@@ -73,7 +74,7 @@ def start_and_wait(
 
         if not return_all_pages:
             return retry_operation(
-                operation_name=f"Fetching web crawl job {job_id}",
+                operation_name=build_fetch_operation_name(f"web crawl job {job_id}"),
                 operation=lambda: self.get(job_id),
                 max_attempts=POLLING_ATTEMPTS,
                 retry_delay_seconds=0.5,

hyperbrowser/client/polling.py

@@ -66,7 +66,7 @@ def _validate_operation_name(operation_name: str) -> None:
         raise HyperbrowserError("operation_name must not contain control characters")
 
 
-def _build_fetch_operation_name(operation_name: str) -> str:
+def build_fetch_operation_name(operation_name: str) -> str:
     prefixed_operation_name = f"{_FETCH_OPERATION_NAME_PREFIX}{operation_name}"
     if len(prefixed_operation_name) <= _MAX_OPERATION_NAME_LENGTH:
         return prefixed_operation_name
@@ -800,7 +800,7 @@ def wait_for_job_result(
         max_wait_seconds=max_wait_seconds,
         max_status_failures=max_status_failures,
     )
-    fetch_operation_name = _build_fetch_operation_name(operation_name)
+    fetch_operation_name = build_fetch_operation_name(operation_name)
     return retry_operation(
         operation_name=fetch_operation_name,
         operation=fetch_result,
@@ -837,7 +837,7 @@ async def wait_for_job_result_async(
         max_wait_seconds=max_wait_seconds,
         max_status_failures=max_status_failures,
     )
-    fetch_operation_name = _build_fetch_operation_name(operation_name)
+    fetch_operation_name = build_fetch_operation_name(operation_name)
     return await retry_operation_async(
         operation_name=fetch_operation_name,
         operation=fetch_result,

tests/test_polling.py

@@ -11,6 +11,7 @@
 
 import hyperbrowser.client.polling as polling_helpers
 from hyperbrowser.client.polling import (
+    build_fetch_operation_name,
     collect_paginated_results,
     collect_paginated_results_async,
     poll_until_terminal_status,
@@ -41,6 +42,15 @@ def test_poll_until_terminal_status_returns_terminal_value():
     assert status == "completed"
 
 
+def test_build_fetch_operation_name_prefixes_when_within_length_limit():
+    assert build_fetch_operation_name("crawl job 123") == "Fetching crawl job 123"
+
+
+def test_build_fetch_operation_name_falls_back_for_max_length_inputs():
+    operation_name = "x" * 200
+    assert build_fetch_operation_name(operation_name) == operation_name
+
+
 def test_poll_until_terminal_status_allows_immediate_terminal_on_zero_max_wait():
     status = poll_until_terminal_status(
         operation_name="sync immediate zero wait",