portacode 2.2.20.dev1__tar.gz → 2.2.20.dev3__tar.gz

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 2.2.20.dev1
+Version: 2.2.20.dev3
 Summary: Device agent for the AI platform that builds, tests, deploys, and operates real software
 Home-page: https://portacode.com/
 Author: Meena Erian

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.2.20.dev1'
-__version_tuple__ = version_tuple = (2, 2, 20, 'dev1')
+__version__ = version = '2.2.20.dev3'
+__version_tuple__ = version_tuple = (2, 2, 20, 'dev3')
 
 __commit_id__ = commit_id = None

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode/browser_cli.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import json
+import os
 import re
 import time
 from pathlib import Path
@@ -9,8 +10,17 @@ from pathlib import Path
 import click
 
 
+_MANAGED_BROWSERS_PATH = Path("/opt/ms-playwright")
+
+
+def _configure_managed_browser_path() -> None:
+    if _MANAGED_BROWSERS_PATH.is_dir():
+        os.environ.setdefault("PLAYWRIGHT_BROWSERS_PATH", str(_MANAGED_BROWSERS_PATH))
+
+
 def run_browser_script(*, url: str, script: str, output_dir: Path, record_video: bool,
                        width: int, height: int, timeout_ms: int) -> dict:
+    _configure_managed_browser_path()
     from playwright.sync_api import sync_playwright
 
     output_dir.mkdir(parents=True, exist_ok=True)

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode/connection/handlers/browser_handlers.py

@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 _RUNNER = r"""
 const fs = require('fs');
 const readline = require('readline');
-const { chromium } = require('playwright');
+const { chromium } = require(process.env.PORTACODE_PLAYWRIGHT_JS || 'playwright');
 const locator = (p,s) => {
   let l;
   if (s.role) l=p.getByRole(s.role, s.name === undefined ? {} : {name:s.name, exact:!!s.exact});
@@ -162,6 +162,19 @@ def _node_executable() -> str:
     )
 
 
+def _playwright_js_package() -> str | None:
+    """Return the JS driver packaged with the installed Python Playwright."""
+    try:
+        import playwright
+
+        package = Path(playwright.__file__).resolve().parent / "driver" / "package"
+        if (package / "package.json").is_file():
+            return str(package)
+    except (ImportError, OSError, TypeError):
+        pass
+    return None
+
+
 class _BrowserWorker:
     def __init__(self, *, user: str, session_id: str, argv: list[str], env: dict[str, str]):
         self.user = user
@@ -343,11 +356,13 @@ class BrowserRunHandler(AsyncHandler):
         env = dict(os.environ)
         env["NODE_PATH"] = await _node_path()
         env.setdefault("PLAYWRIGHT_BROWSERS_PATH", "/opt/ms-playwright")
+        if playwright_js := _playwright_js_package():
+            env["PORTACODE_PLAYWRIGHT_JS"] = playwright_js
         argv = wrap_argv_for_user([_node_executable(), "-e", _RUNNER], user, login=False)
         worker = await _worker_for(
             user=user, session_id=session_id, argv=argv, env=env,
         )
         run_limit = min(75 if video_dir else 300, 20 + len(steps) * timeout_ms / 1000)
         result = await worker.run(config, timeout=run_limit)
-        result.update({"event": "browser_run_response", "success": True})
+        result.update({"event": "browser_run_response", "success": bool(result.get("ok"))})
         return result

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode/connection/handlers/test_browser_handlers.py

@@ -80,6 +80,17 @@ class BrowserRunHandlerTests(unittest.IsolatedAsyncioTestCase):
             with self.assertRaisesRegex(RuntimeError, "Playwright Node runtime"):
                 browser_handlers._node_executable()
 
+    def test_uses_js_driver_bundled_with_python_playwright(self):
+        fake_package = SimpleNamespace(__file__="/opt/venv/playwright/__init__.py")
+        with (
+            patch.dict("sys.modules", {"playwright": fake_package}),
+            patch.object(browser_handlers.Path, "is_file", return_value=True),
+        ):
+            self.assertEqual(
+                browser_handlers._playwright_js_package(),
+                "/opt/venv/playwright/driver/package",
+            )
+
     async def test_reuses_worker_for_same_runtime_user_and_session(self):
         worker = AsyncMock()
         worker.run.return_value = {"ok": True, "steps": [], "screenshots": []}
@@ -91,6 +102,10 @@ class BrowserRunHandlerTests(unittest.IsolatedAsyncioTestCase):
             patch.object(browser_handlers, "wrap_argv_for_user", return_value=["node"]),
             patch.object(browser_handlers, "_node_path", AsyncMock(return_value="/modules")),
             patch.object(browser_handlers, "_node_executable", return_value="/bundled/node"),
+            patch.object(
+                browser_handlers, "_playwright_js_package",
+                return_value="/bundled/playwright/package",
+            ),
             patch.object(browser_handlers, "_worker_for", AsyncMock(return_value=worker)) as get_worker,
         ):
             first = await self.handler.execute(message)
@@ -101,6 +116,31 @@ class BrowserRunHandlerTests(unittest.IsolatedAsyncioTestCase):
         keys = [(call.kwargs["user"], call.kwargs["session_id"]) for call in get_worker.await_args_list]
         self.assertEqual(keys, [("tester", "safe"), ("tester", "safe")])
         self.assertEqual(worker.run.await_count, 2)
+        self.assertEqual(
+            get_worker.await_args_list[0].kwargs["env"]["PORTACODE_PLAYWRIGHT_JS"],
+            "/bundled/playwright/package",
+        )
+
+    async def test_failed_browser_run_is_not_reported_as_successful(self):
+        worker = AsyncMock()
+        worker.run.return_value = {
+            "ok": False, "error": "expected text", "steps": [], "screenshots": []
+        }
+        with (
+            patch.object(browser_handlers, "get_default_runtime_user", return_value="tester"),
+            patch.object(browser_handlers, "get_runtime_user_home", return_value="/tmp"),
+            patch.object(browser_handlers, "mkdir_with_owner"),
+            patch.object(browser_handlers, "wrap_argv_for_user", return_value=["node"]),
+            patch.object(browser_handlers, "_node_path", AsyncMock(return_value="/modules")),
+            patch.object(browser_handlers, "_node_executable", return_value="/bundled/node"),
+            patch.object(browser_handlers, "_playwright_js_package", return_value=None),
+            patch.object(browser_handlers, "_worker_for", AsyncMock(return_value=worker)),
+        ):
+            result = await self.handler.execute(
+                {"session_id": "failure", "steps": [], "final_screenshot": False}
+            )
+        self.assertFalse(result["success"])
+        self.assertEqual(result["error"], "expected text")
 
     async def test_worker_registry_separates_users_and_sessions(self):
         browser_handlers._WORKERS.clear()

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode/tests/test_browser_cli.py

@@ -1,10 +1,12 @@
 import json
+import os
 from pathlib import Path
 from unittest.mock import patch
 
 from click.testing import CliRunner
 
 from portacode.cli import cli
+from portacode import browser_cli
 
 
 def test_browser_run_accepts_inline_python_and_returns_json(tmp_path):
@@ -29,3 +31,21 @@ def test_browser_run_propagates_failure_exit_code(tmp_path):
     with patch("portacode.browser_cli.run_browser_script", return_value={"ok": False, "error": "boom"}):
         result = CliRunner().invoke(cli, ["browser", "run", "--script", "raise Exception()"])
     assert result.exit_code == 1
+
+
+def test_managed_browser_cache_is_used_when_available(monkeypatch):
+    monkeypatch.delenv("PLAYWRIGHT_BROWSERS_PATH", raising=False)
+    monkeypatch.setattr(Path, "is_dir", lambda self: True)
+
+    browser_cli._configure_managed_browser_path()
+
+    assert os.environ["PLAYWRIGHT_BROWSERS_PATH"] == "/opt/ms-playwright"
+
+
+def test_explicit_browser_cache_is_preserved(monkeypatch):
+    monkeypatch.setenv("PLAYWRIGHT_BROWSERS_PATH", "/custom/browsers")
+    monkeypatch.setattr(Path, "is_dir", lambda self: True)
+
+    browser_cli._configure_managed_browser_path()
+
+    assert os.environ["PLAYWRIGHT_BROWSERS_PATH"] == "/custom/browsers"

{portacode-2.2.20.dev1 → portacode-2.2.20.dev3}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 2.2.20.dev1
+Version: 2.2.20.dev3
 Summary: Device agent for the AI platform that builds, tests, deploys, and operates real software
 Home-page: https://portacode.com/
 Author: Meena Erian