Reuse config base URL env resolver in client initialization

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

Author: cursoragent

hyperbrowser/client/base.py

@@ -48,16 +48,10 @@ def __init__(
                     os.environ.get("HYPERBROWSER_HEADERS")
                 )
             )
-            env_base_url = os.environ.get("HYPERBROWSER_BASE_URL")
             if base_url is None:
-                if env_base_url is None:
-                    resolved_base_url = "https://api.hyperbrowser.ai"
-                elif not env_base_url.strip():
-                    raise HyperbrowserError(
-                        "HYPERBROWSER_BASE_URL must not be empty when set"
-                    )
-                else:
-                    resolved_base_url = env_base_url
+                resolved_base_url = ClientConfig.resolve_base_url_from_env(
+                    os.environ.get("HYPERBROWSER_BASE_URL")
+                )
             else:
                 resolved_base_url = base_url
             config = ClientConfig(

hyperbrowser/config.py

@@ -51,16 +51,20 @@ def from_env(cls) -> "ClientConfig":
                 "HYPERBROWSER_API_KEY environment variable is required"
             )
 
-        raw_base_url = os.environ.get("HYPERBROWSER_BASE_URL")
-        if raw_base_url is None:
-            base_url = "https://api.hyperbrowser.ai"
-        elif not raw_base_url.strip():
-            raise HyperbrowserError("HYPERBROWSER_BASE_URL must not be empty when set")
-        else:
-            base_url = raw_base_url
+        base_url = cls.resolve_base_url_from_env(
+            os.environ.get("HYPERBROWSER_BASE_URL")
+        )
         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]]:
         return parse_headers_env_json(raw_headers)
+
+    @staticmethod
+    def resolve_base_url_from_env(raw_base_url: Optional[str]) -> str:
+        if raw_base_url is None:
+            return "https://api.hyperbrowser.ai"
+        if not raw_base_url.strip():
+            raise HyperbrowserError("HYPERBROWSER_BASE_URL must not be empty when set")
+        return raw_base_url

tests/test_config.py

@@ -276,3 +276,15 @@ def test_client_config_parse_headers_from_env_rejects_non_string_input():
         HyperbrowserError, match="HYPERBROWSER_HEADERS must be a string"
     ):
         ClientConfig.parse_headers_from_env(123)  # type: ignore[arg-type]
+
+
+def test_client_config_resolve_base_url_from_env_defaults_and_rejects_blank():
+    assert ClientConfig.resolve_base_url_from_env(None) == "https://api.hyperbrowser.ai"
+    assert (
+        ClientConfig.resolve_base_url_from_env("https://example.local")
+        == "https://example.local"
+    )
+    with pytest.raises(
+        HyperbrowserError, match="HYPERBROWSER_BASE_URL must not be empty"
+    ):
+        ClientConfig.resolve_base_url_from_env("   ")