narada 0.1.33a3__py3-none-any.whl → 0.1.33a5__py3-none-any.whl

narada/client.py

@@ -10,15 +10,6 @@ from typing import Any
 from uuid import uuid4
 
 import aiohttp
-import semver
-from narada.config import BrowserConfig, ProxyConfig
-from narada.utils import assert_never
-from narada.version import __version__
-from narada.window import (
-    LocalBrowserWindow,
-    CloudBrowserWindow,
-    create_side_panel_url,
-)
 from narada_core.errors import (
     NaradaExtensionMissingError,
     NaradaExtensionUnauthenticatedError,
@@ -27,6 +18,7 @@ from narada_core.errors import (
     NaradaUnsupportedBrowserError,
 )
 from narada_core.models import _SdkConfig
+from packaging.version import Version
 from playwright._impl._errors import Error as PlaywrightError
 from playwright.async_api import (
     Browser,
@@ -34,14 +26,21 @@ from playwright.async_api import (
     ElementHandle,
     Page,
     Playwright,
-)
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
-from playwright.async_api import (
     async_playwright,
 )
+from playwright.async_api import TimeoutError as PlaywrightTimeoutError
 from playwright.async_api._context_manager import PlaywrightContextManager
 from rich.console import Console
 
+from narada.config import BrowserConfig, ProxyConfig
+from narada.utils import assert_never
+from narada.version import __version__
+from narada.window import (
+    CloudBrowserWindow,
+    LocalBrowserWindow,
+    create_side_panel_url,
+)
+
 
 @dataclass
 class _LaunchBrowserResult:
@@ -57,14 +56,23 @@ class Narada:
     _EXTENSION_UNAUTHENTICATED_INDICATOR_SELECTOR = "#narada-extension-unauthenticated"
     _INITIALIZATION_ERROR_INDICATOR_SELECTOR = "#narada-initialization-error"
 
-    _api_key: str
+    _auth_headers: dict[str, str]
     _console: Console
     _playwright_context_manager: PlaywrightContextManager | None = None
     _playwright: Playwright | None = None
     _cloud_windows: set[CloudBrowserWindow]
 
-    def __init__(self, *, api_key: str | None = None) -> None:
-        self._api_key = api_key or os.environ["NARADA_API_KEY"]
+    def __init__(
+        self,
+        *,
+        api_key: str | None = None,
+        auth_headers: dict[str, str] | None = None,
+    ) -> None:
+        if auth_headers is not None:
+            self._auth_headers = auth_headers
+        else:
+            api_key = api_key or os.environ["NARADA_API_KEY"]
+            self._auth_headers = {"x-api-key": api_key}
         self._console = Console()
         self._cloud_windows = set()
 
@@ -94,9 +102,7 @@ class Narada:
 
         try:
             async with aiohttp.ClientSession() as session:
-                async with session.get(
-                    url, headers={"x-api-key": self._api_key}
-                ) as resp:
+                async with session.get(url, headers=self._auth_headers) as resp:
                     if not resp.ok:
                         logging.warning(
                             "Failed to fetch SDK config: %s %s",
@@ -116,7 +122,9 @@ class Narada:
             return
 
         package_config = config.packages["narada"]
-        if semver.compare(__version__, package_config.min_required_version) < 0:
+        current_version = Version(__version__)
+        min_required_version = Version(package_config.min_required_version)
+        if current_version < min_required_version:
             raise RuntimeError(
                 f"narada<={__version__} is not supported. Please upgrade to version "
                 f"{package_config.min_required_version} or higher."
@@ -137,7 +145,7 @@ class Narada:
         await self._fix_download_behavior(side_panel_page)
 
         return LocalBrowserWindow(
-            api_key=self._api_key,
+            auth_headers=self._auth_headers,
             browser_process_id=launch_browser_result.browser_process_id,
             browser_window_id=browser_window_id,
             config=config,
@@ -170,7 +178,7 @@ class Narada:
         async with aiohttp.ClientSession() as session:
             async with session.post(
                 endpoint_url,
-                headers={"x-api-key": self._api_key},
+                headers=self._auth_headers,
                 json=request_body,
                 timeout=aiohttp.ClientTimeout(
                     total=180
@@ -200,7 +208,7 @@ class Narada:
                 async with aiohttp.ClientSession() as cleanup_session:
                     async with cleanup_session.post(
                         f"{base_url}/cloud-browser/stop-cloud-browser-session",
-                        headers={"x-api-key": self._api_key},
+                        headers=self._auth_headers,
                         json={"session_id": session_id},
                         timeout=aiohttp.ClientTimeout(total=10),
                     ) as resp:
@@ -248,7 +256,7 @@ class Narada:
         cloud_window = CloudBrowserWindow(
             browser_window_id=browser_window_id,
             session_id=session_id,
-            api_key=self._api_key,
+            auth_headers=self._auth_headers,
         )
 
         # Track the window for cleanup in __aexit__
@@ -311,7 +319,7 @@ class Narada:
             self._print_success_message(browser_window_id)
 
         return LocalBrowserWindow(
-            api_key=self._api_key,
+            auth_headers=self._auth_headers,
             browser_process_id=None,
             browser_window_id=browser_window_id,
             config=config,

narada/window.py

@@ -8,7 +8,6 @@ from pathlib import Path
 from typing import IO, Any, TypeVar, overload
 
 import aiohttp
-from narada.config import BrowserConfig
 from narada_core.actions.models import (
     AgenticMouseAction,
     AgenticMouseActionRequest,
@@ -53,6 +52,8 @@ from playwright.async_api import (
 )
 from pydantic import BaseModel
 
+from narada.config import BrowserConfig
+
 logger = logging.getLogger(__name__)
 
 _StructuredOutput = TypeVar("_StructuredOutput", bound=BaseModel)
@@ -67,18 +68,18 @@ class _PresignedPost(BaseModel):
 
 
 class BaseBrowserWindow(ABC):
-    _api_key: str
+    _auth_headers: dict[str, str]
     _base_url: str
     _browser_window_id: str
 
     def __init__(
         self,
         *,
-        api_key: str,
+        auth_headers: dict[str, str],
         base_url: str,
         browser_window_id: str,
     ) -> None:
-        self._api_key = api_key
+        self._auth_headers = auth_headers
         self._base_url = base_url
         self._browser_window_id = browser_window_id
 
@@ -99,7 +100,7 @@ class BaseBrowserWindow(ABC):
             # First generate a presigned POST for uploading the file.
             async with session.post(
                 f"{self._base_url}/remote-dispatch/generate-file-upload-presigned-post",
-                headers={"x-api-key": self._api_key},
+                headers=self._auth_headers,
                 json={"filename": filename},
             ) as resp:
                 resp.raise_for_status()
@@ -192,8 +193,6 @@ class BaseBrowserWindow(ABC):
         """
         deadline = time.monotonic() + timeout
 
-        headers = {"x-api-key": self._api_key}
-
         agent_prefix = (
             agent.prompt_prefix() if isinstance(agent, Agent) else f"{agent} "
         )
@@ -238,7 +237,7 @@ class BaseBrowserWindow(ABC):
             async with aiohttp.ClientSession() as session:
                 async with session.post(
                     f"{self._base_url}/remote-dispatch",
-                    headers=headers,
+                    headers=self._auth_headers,
                     json=body,
                     timeout=aiohttp.ClientTimeout(total=timeout),
                 ) as resp:
@@ -248,7 +247,7 @@ class BaseBrowserWindow(ABC):
                 while (now := time.monotonic()) < deadline:
                     async with session.get(
                         f"{self._base_url}/remote-dispatch/responses/{request_id}",
-                        headers=headers,
+                        headers=self._auth_headers,
                         timeout=aiohttp.ClientTimeout(total=deadline - now),
                     ) as resp:
                         resp.raise_for_status()
@@ -380,6 +379,7 @@ class BaseBrowserWindow(ABC):
                 selectors=selectors,
                 fallback_operator_query=fallback_operator_query,
             ),
+            response_model=response_model,
             timeout=timeout,
         )
 
@@ -511,8 +511,6 @@ class BaseBrowserWindow(ABC):
         *,
         timeout: int | None = None,
     ) -> _ResponseModel | None:
-        headers = {"x-api-key": self._api_key}
-
         body = {
             "action": request.model_dump(),
             "browserWindowId": self.browser_window_id,
@@ -523,7 +521,7 @@ class BaseBrowserWindow(ABC):
         async with aiohttp.ClientSession() as session:
             async with session.post(
                 f"{self._base_url}/extension-actions",
-                headers=headers,
+                headers=self._auth_headers,
                 json=body,
                 # Don't specify `timeout` here as the (soft) timeout is handled by the server.
             ) as resp:
@@ -551,7 +549,7 @@ class LocalBrowserWindow(BaseBrowserWindow):
     def __init__(
         self,
         *,
-        api_key: str,
+        auth_headers: dict[str, str],
         browser_process_id: int | None,
         browser_window_id: str,
         config: BrowserConfig,
@@ -559,7 +557,7 @@ class LocalBrowserWindow(BaseBrowserWindow):
     ) -> None:
         base_url = os.getenv("NARADA_API_BASE_URL", "https://api.narada.ai/fast/v2")
         super().__init__(
-            api_key=api_key,
+            auth_headers=auth_headers,
             base_url=base_url,
             browser_window_id=browser_window_id,
         )
@@ -591,10 +589,19 @@ class LocalBrowserWindow(BaseBrowserWindow):
 
 
 class RemoteBrowserWindow(BaseBrowserWindow):
-    def __init__(self, *, browser_window_id: str, api_key: str | None = None) -> None:
+    def __init__(
+        self,
+        *,
+        browser_window_id: str,
+        api_key: str | None = None,
+        auth_headers: dict[str, str] | None = None,
+    ) -> None:
         base_url = os.getenv("NARADA_API_BASE_URL", "https://api.narada.ai/fast/v2")
+        if auth_headers is None:
+            api_key = api_key or os.environ["NARADA_API_KEY"]
+            auth_headers = {"x-api-key": api_key}
         super().__init__(
-            api_key=api_key or os.environ["NARADA_API_KEY"],
+            auth_headers=auth_headers,
             base_url=base_url,
             browser_window_id=browser_window_id,
         )
@@ -616,10 +623,14 @@ class CloudBrowserWindow(BaseBrowserWindow):
         browser_window_id: str,
         session_id: str,
         api_key: str | None = None,
+        auth_headers: dict[str, str] | None = None,
     ) -> None:
         base_url = os.getenv("NARADA_API_BASE_URL", "https://api.narada.ai/fast/v2")
+        if auth_headers is None:
+            api_key = api_key or os.environ["NARADA_API_KEY"]
+            auth_headers = {"x-api-key": api_key}
         super().__init__(
-            api_key=api_key or os.environ["NARADA_API_KEY"],
+            auth_headers=auth_headers,
             base_url=base_url,
             browser_window_id=browser_window_id,
         )
@@ -631,7 +642,7 @@ class CloudBrowserWindow(BaseBrowserWindow):
             async with aiohttp.ClientSession() as session:
                 async with session.post(
                     f"{self._base_url}/cloud-browser/stop-cloud-browser-session",
-                    headers={"x-api-key": self._api_key},
+                    headers=self._auth_headers,
                     json={
                         "session_id": self._session_id,
                     },

{narada-0.1.33a3.dist-info → narada-0.1.33a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: narada
-Version: 0.1.33a3
+Version: 0.1.33a5
 Summary: Python client SDK for Narada
 Project-URL: Homepage, https://github.com/NaradaAI/narada-python-sdk/narada
 Project-URL: Repository, https://github.com/NaradaAI/narada-python-sdk
@@ -10,9 +10,9 @@ License-Expression: Apache-2.0
 Requires-Python: >=3.12
 Requires-Dist: aiohttp>=3.12.13
 Requires-Dist: narada-core==0.0.11
+Requires-Dist: packaging==24.2
 Requires-Dist: playwright>=1.53.0
 Requires-Dist: rich>=14.0.0
-Requires-Dist: semver>=3.0.4
 Description-Content-Type: text/markdown
 
 <p align="center">

{narada-0.1.33a3.dist-info → narada-0.1.33a5.dist-info}/RECORD

@@ -1,10 +1,10 @@
 narada/__init__.py,sha256=gVa9HUFTeHot7VR2XPtCEsVeRiK7MDJJvKU1eEhLqXQ,1013
-narada/client.py,sha256=Ea-zyJo6rZCQNi1higShelILkR9FLpNrtYoFse7heUA,26630
+narada/client.py,sha256=HSxwlKzYZuLt-BfReXDSAOSV6g0DCrcfFbrVc13VJMk,26923
 narada/config.py,sha256=S0B8GNd-0td_69oKaPN60WAq_ODeYU7avE_KAxN5vCg,3052
 narada/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 narada/utils.py,sha256=gdLwNMXPpRohDcIIe0cB3KhvZ8X1QfAlKVh1sXWeJmk,1284
 narada/version.py,sha256=kwW6yy0_4Pf3kt888eeCG0VwBb2L2rCkrkpdZEC_3rA,193
-narada/window.py,sha256=e3pXn-wQMKm8QRvtAKfep0iGQE2LP9doP85z1t6VVpI,23036
-narada-0.1.33a3.dist-info/METADATA,sha256=CUJqBDNN1q9JmIqk9N0E-QUDiQoBjbYTQi1jJYcXkdI,5149
-narada-0.1.33a3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-narada-0.1.33a3.dist-info/RECORD,,
+narada/window.py,sha256=-lN9ey3KSasvyQNzkh1ejPMmlojlVbTf9jqDT41YGr0,23454
+narada-0.1.33a5.dist-info/METADATA,sha256=M817Dy9ZvotiB-Gml3AjATk-2M0bCXwApuTzAWPnFTA,5151
+narada-0.1.33a5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+narada-0.1.33a5.dist-info/RECORD,,