narada 0.2.1__tar.gz → 0.2.2__tar.gz

{narada-0.2.1 → narada-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: narada
-Version: 0.2.1
+Version: 0.2.2
 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

{narada-0.2.1 → narada-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "narada"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python client SDK for Narada"
 license = "Apache-2.0"
 readme = "README.md"

{narada-0.2.1 → narada-0.2.2}/src/narada/environment.py

@@ -970,8 +970,7 @@ class BrowserEnvironment(BaseBrowserEnvironment):
         )
 
     async def _initialize(self) -> None:
-        self._playwright_context_manager = async_playwright()
-        self._playwright = await self._playwright_context_manager.__aenter__()
+        await self._start_playwright()
         if self._attach_to_existing:
             await self._initialize_in_existing_browser_window()
         else:
@@ -997,6 +996,10 @@ class BrowserEnvironment(BaseBrowserEnvironment):
         finally:
             await self._stop_playwright()
 
+    async def _start_playwright(self) -> None:
+        self._playwright_context_manager = async_playwright()
+        self._playwright = await self._playwright_context_manager.__aenter__()
+
     async def _stop_playwright(self) -> None:
         if self._playwright_context_manager is None:
             return
@@ -1480,8 +1483,7 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
         ``#narada-browser-window-id`` (extension install retries apply). ``config`` controls
         interactive prompts and related behavior.
         """
-        self._playwright_context_manager = async_playwright()
-        self._playwright = await self._playwright_context_manager.__aenter__()
+        await self._start_playwright()
 
         request_body = {
             "require_extension": True,
@@ -1557,6 +1559,10 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
             # Re-raise the original connection error
             raise
 
+    async def _start_playwright(self) -> None:
+        self._playwright_context_manager = async_playwright()
+        self._playwright = await self._playwright_context_manager.__aenter__()
+
     async def _stop_playwright(self) -> None:
         if self._playwright_context_manager is None:
             return
@@ -1597,6 +1603,7 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
         session_id: str,
         login_url: str,
         cdp_auth_headers: dict[str, str],
+        expected_browser_window_id: str | None = None,
     ) -> None:
         assert self._playwright is not None
 
@@ -1608,6 +1615,23 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
         # Navigate to login URL (provided by backend with custom token)
         context = browser.contexts[0]
         initialization_page = context.pages[0]
+        if expected_browser_window_id is not None:
+            # Put the backend-owned browser ID into sessionStorage before hydration
+            # so AgentCore sessions use the right Firestore route when needed.
+            expected_browser_window_id_json = json.dumps(expected_browser_window_id)
+            await context.add_init_script(
+                script=f"""
+                    (() => {{
+                      const expectedBrowserWindowId = {expected_browser_window_id_json};
+                      try {{
+                        sessionStorage.setItem(
+                          "naradaBrowserWindowId",
+                          expectedBrowserWindowId
+                        );
+                      }} catch (_error) {{}}
+                    }})();
+                """
+            )
         await initialization_page.goto(
             login_url, timeout=15_000, wait_until="domcontentloaded"
         )
@@ -1628,7 +1652,7 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
                     raise
                 logging.info("Waiting for Narada extension to be installed...")
                 await asyncio.sleep(1)
-            except NaradaTimeoutError:
+            except (NaradaTimeoutError, NaradaExtensionUnauthenticatedError):
                 if attempt == max_attempts - 1:
                     raise
                 # If browser window ID is not found, reload the page and try again
@@ -1637,6 +1661,15 @@ class CloudBrowserEnvironment(BaseBrowserEnvironment):
                     login_url, timeout=15_000, wait_until="domcontentloaded"
                 )
 
+        if (
+            expected_browser_window_id is not None
+            and browser_window_id != expected_browser_window_id
+        ):
+            raise RuntimeError(
+                "Initialized cloud session reported browserWindowId "
+                f"{browser_window_id!r}, expected {expected_browser_window_id!r}."
+            )
+
         self._browser_window_id = browser_window_id
         self._session_id = session_id
         self._context = context

{narada-0.2.1 → narada-0.2.2}/tests/test_cloud_browser.py

@@ -80,7 +80,9 @@ def _build_cloud_environment_with_page(page: AsyncMock) -> CloudBrowserEnvironme
         auth_headers={"x-api-key": "test-key"},
         config=BrowserConfig(interactive=False),
     )
-    browser = SimpleNamespace(contexts=[SimpleNamespace(pages=[page])])
+    browser = SimpleNamespace(
+        contexts=[SimpleNamespace(pages=[page], add_init_script=AsyncMock())]
+    )
     env._playwright = SimpleNamespace(
         chromium=SimpleNamespace(connect_over_cdp=AsyncMock(return_value=browser))
     )
@@ -236,6 +238,35 @@ async def test_extension_action_request_includes_action_execution_id(
     assert action_execution_id.startswith("action_")
 
 
+@pytest.mark.asyncio
+async def test_remote_browser_environment_with_cloud_session_stops_session_by_default(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    import narada.environment as environment_module
+
+    stop_cloud_browser_session = AsyncMock()
+    monkeypatch.setattr(
+        environment_module,
+        "_stop_cloud_browser_session",
+        stop_cloud_browser_session,
+    )
+
+    env = RemoteBrowserEnvironment(
+        browser_window_id="browser-window-123",
+        cloud_browser_session_id="session-123",
+        auth_headers={"x-api-key": "test-key"},
+    )
+
+    await env.close()
+
+    stop_cloud_browser_session.assert_awaited_once_with(
+        base_url=env._base_url,
+        auth_headers={"x-api-key": "test-key"},
+        session_id="session-123",
+        timeout=None,
+    )
+
+
 @pytest.mark.asyncio
 async def test_lambda_environment_uses_backend_initialization(
     monkeypatch: pytest.MonkeyPatch,
@@ -312,6 +343,7 @@ async def test_cloud_browser_environment_uses_domcontentloaded_for_login_navigat
 ) -> None:
     page = AsyncMock()
     env = _build_cloud_environment_with_page(page)
+    context = env._playwright.chromium.connect_over_cdp.return_value.contexts[0]
 
     wait_for_browser_window_id = AsyncMock(return_value="browser-window-123")
     monkeypatch.setattr(
@@ -335,10 +367,69 @@ async def test_cloud_browser_environment_uses_domcontentloaded_for_login_navigat
         BrowserConfig(interactive=False),
         timeout=30_000,
     )
+    context.add_init_script.assert_not_awaited()
     assert env.browser_window_id == "browser-window-123"
     assert env.cloud_browser_session_id == "session-123"
 
 
+@pytest.mark.asyncio
+async def test_cloud_browser_environment_seeds_expected_browser_window_id_before_navigation(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    page = AsyncMock()
+    env = _build_cloud_environment_with_page(page)
+    context = env._playwright.chromium.connect_over_cdp.return_value.contexts[0]
+    events: list[str] = []
+
+    async def add_init_script(*args, **kwargs) -> None:
+        events.append("seed")
+
+    async def goto(*args, **kwargs) -> None:
+        events.append("goto")
+
+    context.add_init_script.side_effect = add_init_script
+    page.goto.side_effect = goto
+    wait_for_browser_window_id = AsyncMock(return_value="backend-window-123")
+    monkeypatch.setattr(
+        env, "_wait_for_cloud_browser_window_id", wait_for_browser_window_id
+    )
+
+    await env._initialize_cloud_browser_window(
+        cdp_websocket_url="wss://agentcore.example.test/session-123",
+        session_id="session-123",
+        login_url="https://app.narada.ai/chat?customToken=test-token",
+        cdp_auth_headers={"Authorization": "signed-cdp"},
+        expected_browser_window_id="backend-window-123",
+    )
+
+    assert events[:2] == ["seed", "goto"]
+    script = context.add_init_script.await_args.kwargs["script"]
+    assert "naradaBrowserWindowId" in script
+    assert "backend-window-123" in script
+    assert env.browser_window_id == "backend-window-123"
+
+
+@pytest.mark.asyncio
+async def test_cloud_browser_environment_rejects_unexpected_seeded_browser_window_id(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    page = AsyncMock()
+    env = _build_cloud_environment_with_page(page)
+    wait_for_browser_window_id = AsyncMock(return_value="frontend-window-123")
+    monkeypatch.setattr(
+        env, "_wait_for_cloud_browser_window_id", wait_for_browser_window_id
+    )
+
+    with pytest.raises(RuntimeError, match="expected 'backend-window-123'"):
+        await env._initialize_cloud_browser_window(
+            cdp_websocket_url="wss://agentcore.example.test/session-123",
+            session_id="session-123",
+            login_url="https://app.narada.ai/chat?customToken=test-token",
+            cdp_auth_headers={"Authorization": "signed-cdp"},
+            expected_browser_window_id="backend-window-123",
+        )
+
+
 @pytest.mark.asyncio
 async def test_cloud_browser_environment_uses_domcontentloaded_for_retry_navigation(
     monkeypatch: pytest.MonkeyPatch,