Read HYPERBROWSER_HEADERS in default client construction

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

Author: cursoragent

hyperbrowser/client/base.py

@@ -25,6 +25,13 @@ def __init__(
             )
 
         if config is None:
+            resolved_headers = (
+                headers
+                if headers is not None
+                else ClientConfig.parse_headers_from_env(
+                    os.environ.get("HYPERBROWSER_HEADERS")
+                )
+            )
             config = ClientConfig(
                 api_key=(
                     api_key
@@ -38,7 +45,7 @@ def __init__(
                         "HYPERBROWSER_BASE_URL", "https://api.hyperbrowser.ai"
                     )
                 ),
-                headers=headers,
+                headers=resolved_headers,
             )
 
         if not config.api_key:

hyperbrowser/config.py

@@ -50,25 +50,28 @@ def from_env(cls) -> "ClientConfig":
         base_url = os.environ.get(
             "HYPERBROWSER_BASE_URL", "https://api.hyperbrowser.ai"
         )
-        headers = None
-        raw_headers = os.environ.get("HYPERBROWSER_HEADERS")
-        if raw_headers is not None and raw_headers.strip():
-            try:
-                parsed_headers = json.loads(raw_headers)
-            except json.JSONDecodeError as exc:
-                raise HyperbrowserError(
-                    "HYPERBROWSER_HEADERS must be valid JSON object"
-                ) from exc
-            if not isinstance(parsed_headers, dict):
-                raise HyperbrowserError(
-                    "HYPERBROWSER_HEADERS must be a JSON object of string pairs"
-                )
-            if any(
-                not isinstance(key, str) or not isinstance(value, str)
-                for key, value in parsed_headers.items()
-            ):
-                raise HyperbrowserError(
-                    "HYPERBROWSER_HEADERS must be a JSON object of string pairs"
-                )
-            headers = parsed_headers
+        headers = cls.parse_headers_from_env(os.environ.get("HYPERBROWSER_HEADERS"))
         return cls(api_key=api_key, base_url=base_url, headers=headers)
+
+    @staticmethod
+    def parse_headers_from_env(raw_headers: Optional[str]) -> Optional[Dict[str, str]]:
+        if raw_headers is None or not raw_headers.strip():
+            return None
+        try:
+            parsed_headers = json.loads(raw_headers)
+        except json.JSONDecodeError as exc:
+            raise HyperbrowserError(
+                "HYPERBROWSER_HEADERS must be valid JSON object"
+            ) from exc
+        if not isinstance(parsed_headers, dict):
+            raise HyperbrowserError(
+                "HYPERBROWSER_HEADERS must be a JSON object of string pairs"
+            )
+        if any(
+            not isinstance(key, str) or not isinstance(value, str)
+            for key, value in parsed_headers.items()
+        ):
+            raise HyperbrowserError(
+                "HYPERBROWSER_HEADERS must be a JSON object of string pairs"
+            )
+        return parsed_headers

tests/test_custom_headers.py

@@ -5,6 +5,7 @@
 
 from hyperbrowser import AsyncHyperbrowser, Hyperbrowser
 from hyperbrowser.config import ClientConfig
+from hyperbrowser.exceptions import HyperbrowserError
 from hyperbrowser.transport.async_transport import AsyncTransport
 from hyperbrowser.transport.sync import SyncTransport
 
@@ -111,6 +112,35 @@ async def run() -> None:
     asyncio.run(run())
 
 
+def test_sync_client_constructor_reads_headers_from_environment(monkeypatch):
+    monkeypatch.setenv("HYPERBROWSER_HEADERS", '{"X-Team-Trace":"env-sync"}')
+    client = Hyperbrowser(api_key="test-key")
+    try:
+        assert client.transport.client.headers["X-Team-Trace"] == "env-sync"
+    finally:
+        client.close()
+
+
+def test_async_client_constructor_reads_headers_from_environment(monkeypatch):
+    monkeypatch.setenv("HYPERBROWSER_HEADERS", '{"X-Team-Trace":"env-async"}')
+
+    async def run() -> None:
+        client = AsyncHyperbrowser(api_key="test-key")
+        try:
+            assert client.transport.client.headers["X-Team-Trace"] == "env-async"
+        finally:
+            await client.close()
+
+    asyncio.run(run())
+
+
+def test_client_constructor_rejects_invalid_env_headers(monkeypatch):
+    monkeypatch.setenv("HYPERBROWSER_HEADERS", "{invalid")
+
+    with pytest.raises(HyperbrowserError, match="HYPERBROWSER_HEADERS"):
+        Hyperbrowser(api_key="test-key")
+
+
 def test_client_constructor_rejects_mixed_config_and_direct_args():
     with pytest.raises(TypeError, match="Pass either `config`"):
         Hyperbrowser(