cmdop 0.1.21__py3-none-any.whl → 0.1.22__py3-none-any.whl

cmdop/services/browser/service/aio.py

@@ -0,0 +1,30 @@
+"""Async browser service stub.
+
+Async browser is not implemented yet. Use sync BrowserService instead.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, NoReturn
+
+if TYPE_CHECKING:
+    from cmdop.transport.base import BaseTransport
+
+
+class AsyncBrowserService:
+    """
+    Async browser service stub.
+
+    Not implemented yet. Use sync CMDOPClient.browser instead.
+    """
+
+    def __init__(self, transport: BaseTransport) -> None:
+        self._transport = transport
+
+    def _not_implemented(self) -> NoReturn:
+        raise NotImplementedError(
+            "Async browser is not implemented. Use sync CMDOPClient.browser instead."
+        )
+
+    async def create_session(self, *args, **kwargs) -> NoReturn:
+        self._not_implemented()

cmdop/services/browser/{sync/service.py → service/sync.py}

@@ -6,7 +6,7 @@ import json
 from typing import TYPE_CHECKING, Any
 
 from cmdop.services.base import BaseService
-from cmdop.services.browser.base.service import BaseServiceMixin, cookie_to_pb, pb_to_cookie
+from cmdop.services.browser.service._helpers import BaseServiceMixin, cookie_to_pb, pb_to_cookie
 from cmdop.services.browser.models import BrowserCookie, BrowserState, PageInfo, raise_browser_error
 
 if TYPE_CHECKING:
@@ -47,7 +47,7 @@ class BrowserService(BaseService, BaseServiceMixin):
         height: int = 800,
     ) -> "BrowserSession":
         from cmdop._generated.rpc_messages.browser_pb2 import BrowserCreateSessionRequest
-        from cmdop.services.browser.sync.session import BrowserSession
+        from cmdop.services.browser.session import BrowserSession
 
         request = BrowserCreateSessionRequest(
             provider=provider,

cmdop/services/browser/session.py

@@ -0,0 +1,166 @@
+"""Browser session with capability-based API."""
+
+from __future__ import annotations
+from typing import TYPE_CHECKING, Any
+
+from cmdop.services.browser.models import BrowserCookie, BrowserState, PageInfo
+
+from .capabilities import (
+    ScrollCapability,
+    InputCapability,
+    TimingCapability,
+    DOMCapability,
+    FetchCapability,
+)
+
+if TYPE_CHECKING:
+    from cmdop.services.browser.service.sync import BrowserService
+
+
+class BrowserSession:
+    """Browser session with grouped capabilities.
+
+    Core methods (on session directly):
+        session.navigate(url)
+        session.click(selector)
+        session.type(selector, text)
+        session.wait_for(selector)
+        session.execute_script(js)
+
+    Capabilities (grouped by function):
+        session.scroll.js("down", 500)
+        session.scroll.to_bottom()
+        session.input.click_js(selector)
+        session.input.key("Escape")
+        session.timing.wait(1000)
+        session.dom.soup()
+        session.fetch.json("/api/data")
+
+    Usage:
+        with service.create_session() as session:
+            session.navigate("https://example.com")
+            session.scroll.js("down", 500)
+            session.input.click_js(".button")
+    """
+
+    __slots__ = (
+        "_service",
+        "_session_id",
+        "_scroll",
+        "_input",
+        "_timing",
+        "_dom",
+        "_fetch",
+    )
+
+    def __init__(self, service: "BrowserService", session_id: str) -> None:
+        self._service = service
+        self._session_id = session_id
+        self._scroll: ScrollCapability | None = None
+        self._input: InputCapability | None = None
+        self._timing: TimingCapability | None = None
+        self._dom: DOMCapability | None = None
+        self._fetch: FetchCapability | None = None
+
+    @property
+    def session_id(self) -> str:
+        return self._session_id
+
+    # === Capabilities (lazy init) ===
+
+    @property
+    def scroll(self) -> ScrollCapability:
+        """Scroll: js(), to_bottom(), to_element(), info(), native(), collect()"""
+        if self._scroll is None:
+            self._scroll = ScrollCapability(self)
+        return self._scroll
+
+    @property
+    def input(self) -> InputCapability:
+        """Input: click_js(), key(), click_all(), hover(), hover_js()"""
+        if self._input is None:
+            self._input = InputCapability(self)
+        return self._input
+
+    @property
+    def timing(self) -> TimingCapability:
+        """Timing: wait(), seconds(), random(), timeout()"""
+        if self._timing is None:
+            self._timing = TimingCapability(self)
+        return self._timing
+
+    @property
+    def dom(self) -> DOMCapability:
+        """DOM: html(), text(), soup(), parse(), select(), close_modal(), extract()"""
+        if self._dom is None:
+            self._dom = DOMCapability(self)
+        return self._dom
+
+    @property
+    def fetch(self) -> FetchCapability:
+        """Fetch: json(), all(), execute()"""
+        if self._fetch is None:
+            self._fetch = FetchCapability(self)
+        return self._fetch
+
+    # === Core Methods ===
+
+    def navigate(self, url: str, timeout_ms: int = 30000) -> str:
+        """Navigate to URL. Returns final URL."""
+        return self._service.navigate(self._session_id, url, timeout_ms)
+
+    def click(self, selector: str, timeout_ms: int = 5000, move_cursor: bool = False) -> None:
+        """Click element by CSS selector."""
+        self._service.click(self._session_id, selector, timeout_ms, move_cursor)
+
+    def type(self, selector: str, text: str, human_like: bool = False, clear_first: bool = True) -> None:
+        """Type text into element."""
+        self._service.type(self._session_id, selector, text, human_like, clear_first)
+
+    def wait_for(self, selector: str, timeout_ms: int = 30000) -> bool:
+        """Wait for element to appear."""
+        return self._service.wait_for(self._session_id, selector, timeout_ms)
+
+    def execute_script(self, script: str) -> str:
+        """Execute raw JavaScript."""
+        return self._service.execute_script(self._session_id, script)
+
+    # === State ===
+
+    def screenshot(self, full_page: bool = False) -> bytes:
+        """Take screenshot."""
+        return self._service.screenshot(self._session_id, full_page)
+
+    def get_state(self) -> BrowserState:
+        """Get browser state."""
+        return self._service.get_state(self._session_id)
+
+    def get_cookies(self, domain: str = "") -> list[BrowserCookie]:
+        """Get cookies."""
+        return self._service.get_cookies(self._session_id, domain)
+
+    def set_cookies(self, cookies: list[BrowserCookie | dict]) -> None:
+        """Set cookies."""
+        self._service.set_cookies(self._session_id, cookies)
+
+    def get_page_info(self) -> PageInfo:
+        """Get page info."""
+        return self._service.get_page_info(self._session_id)
+
+    # === Internal ===
+
+    def _call_service(self, method: str, *args: Any, **kwargs: Any) -> Any:
+        """Call service method (used by capabilities)."""
+        return getattr(self._service, method)(self._session_id, *args, **kwargs)
+
+    # === Context Manager ===
+
+    def close(self) -> None:
+        """Close session."""
+        self._service.close_session(self._session_id)
+
+    def __enter__(self) -> "BrowserSession":
+        return self
+
+    def __exit__(self, *args: Any) -> None:
+        self.close()

{cmdop-0.1.21.dist-info → cmdop-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdop
-Version: 0.1.21
+Version: 0.1.22
 Summary: Python SDK for CMDOP agent interaction
 Project-URL: Homepage, https://cmdop.com
 Project-URL: Documentation, https://cmdop.com
@@ -145,91 +145,100 @@ health: Health = result.output  # Typed!
 
 ## Browser
 
+Capability-based API for browser automation.
+
 ```python
-with client.browser.create_session() as b:
-    b.navigate("https://shop.com/products")
-    b.close_modal()  # Close popups
+with client.browser.create_session() as s:
+    s.navigate("https://shop.com/products")
+    s.dom.close_modal()  # Close popups
 
     # BeautifulSoup parsing
-    soup = b.soup()  # SoupWrapper with chainable API
+    soup = s.dom.soup()  # SoupWrapper with chainable API
     for item in soup.select(".product"):
         title = item.select_one("h2").text()
         price = item.attr("data-price")
 
     # Scrolling with random delays
     for _ in range(10):
-        soup = b.soup(".listings")
-        # ... parse ...
-        b.scroll("down", 700)
-        b.wait_random(0.8, 1.5)  # Random delay
+        soup = s.dom.soup(".listings")
+        s.scroll.js("down", 700)
+        s.timing.random(0.8, 1.5)
 
-    # Click with cursor movement (human-like)
-    b.click("button.buy", move_cursor=True)  # Moves cursor before clicking
+    # Click with cursor movement
+    s.click("button.buy", move_cursor=True)
 
     # Click all "See more" buttons
-    b.click_all_by_text("See more")
+    s.input.click_all("See more")
 
-    # Native mouse operations
-    b.mouse_move(500, 300)  # Smooth cursor movement
-    b.hover(".tooltip-trigger")  # Hover to reveal tooltip
+    # Mouse operations
+    s.input.mouse_move(500, 300)
+    s.input.hover(".tooltip-trigger")
 
     # JS fetch (bypass CORS, inherit cookies)
-    data = b.fetch_json("https://api.site.com/v1/items")
+    data = s.fetch.json("/api/items")
 ```
 
+### Core Methods (on session)
+
 | Method | Description |
 |--------|-------------|
 | `navigate(url)` | Go to URL |
-| `click(selector, move_cursor)` | Click element (optionally move cursor first) |
-| `click_all_by_text(text, role)` | Click all matching elements |
+| `click(selector, move_cursor)` | Click element |
 | `type(selector, text)` | Type text |
-| `wait_for(selector, ms)` | Wait for element |
-| `wait_seconds(n)` | Sleep |
-| `wait_random(min, max)` | Random sleep |
-| `extract(selector, attr)` | Get text/attr |
-| `get_html(selector)` | Get HTML |
-| `soup(selector)` | → SoupWrapper |
-| `parse_html(html)` | → BeautifulSoup |
-| `fetch_json(url)` | JS fetch → dict |
-| `fetch_all(urls)` | Parallel fetch |
-| `execute_js(code)` | Run async JS |
+| `wait_for(selector)` | Wait for element |
+| `execute_script(js)` | Run JavaScript |
 | `screenshot()` | PNG bytes |
-| `scroll(dir, amount, ...)` | Native scroll page |
-| `scroll_to(selector)` | Scroll element into view |
-| `get_scroll_info()` | Position + page size |
-| `get_page_info()` | Comprehensive page info |
-| `mouse_move(x, y, steps)` | Move cursor to coordinates |
-| `hover(selector)` | Hover over element |
-| `select(selector, value)` | Dropdown select |
-| `close_modal()` | Close dialogs |
-| `press_key(key, selector)` | Press keyboard key |
+| `get_state()` | URL + title |
+| `get_page_info()` | Full page info |
 | `get/set_cookies()` | Cookie management |
-| `with_timeout(fn, sec, cleanup)` | Run with timeout, skip if hangs |
 
-**with_timeout() - Smart timeout for long operations:**
-```python
-# Sync
-result, ok = browser.with_timeout(
-    lambda: process_item(browser, item),
-    timeout_sec=60,
-    on_timeout=lambda: browser.press_key('Escape'),
-)
-if not ok:
-    print("Skipped - timed out")
+### Capabilities
 
-# Async
-result, ok = await browser.with_timeout(
-    process_item(browser, item),  # coroutine
-    timeout_sec=60,
-    on_timeout=lambda: browser.press_key('Escape'),
-)
-```
+**`session.scroll`** - Scrolling
+| Method | Description |
+|--------|-------------|
+| `js(dir, amount)` | JS scroll (works on complex sites) |
+| `native(dir, amount)` | Browser API scroll |
+| `to_bottom()` | Scroll to page bottom |
+| `to_element(selector)` | Scroll element into view |
+| `info()` | Get scroll position |
+| `infinite(extract_fn)` | Smart infinite scroll with extraction |
+
+**`session.input`** - Input operations
+| Method | Description |
+|--------|-------------|
+| `click_js(selector)` | JS click (reliable) |
+| `click_all(text, role)` | Click all matching elements |
+| `key(key, selector)` | Press keyboard key |
+| `hover(selector)` | Hover over element (native) |
+| `hover_js(selector)` | Hover via JS |
+| `mouse_move(x, y)` | Move cursor to coordinates |
+
+**`session.timing`** - Delays
+| Method | Description |
+|--------|-------------|
+| `wait(ms)` | Wait milliseconds |
+| `seconds(n)` | Wait seconds |
+| `random(min, max)` | Random delay |
+| `timeout(fn, sec, cleanup)` | Run with timeout |
 
-**scroll() parameters:**
-- `direction`: "up", "down", "left", "right"
-- `amount`: pixels to scroll
-- `smooth`: animate scroll (default True)
-- `selector`: scroll element into view (alternative to direction/amount)
+**`session.dom`** - DOM operations
+| Method | Description |
+|--------|-------------|
+| `html(selector)` | Get HTML |
+| `text(selector)` | Get text content |
+| `soup(selector)` | → SoupWrapper |
+| `parse(html)` | → BeautifulSoup |
+| `extract(selector, attr)` | Get text/attr list |
+| `select(selector, value)` | Dropdown select |
+| `close_modal()` | Close dialogs |
+
+**`session.fetch`** - HTTP from browser context
+| Method | Description |
+|--------|-------------|
+| `json(url)` | Fetch JSON |
+| `all(requests)` | Parallel fetch |
+| `execute(method, url, ...)` | Custom request |
 
 ## SDKBaseModel
 

{cmdop-0.1.21.dist-info → cmdop-0.1.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
-cmdop/__init__.py,sha256=36xYFVpp83AE5E8N5T1qbrIaFCC2sSXQJRha5fXpyD0,5200
-cmdop/client.py,sha256=NzCBMIAj2vnVzwU1OUttW_kpgJh5aRtmixOwa9HUUUg,14924
+cmdop/__init__.py,sha256=te8zdIJesHnMNTru-7YrTOnoUObhAm972gTFbhoHW5g,5200
+cmdop/client.py,sha256=nTotStZPBfYN3TrHH-OlEJMSVAXskYMQRkocsFmyaBY,14601
 cmdop/config.py,sha256=vpw1aGCyS4NKlZyzVur81Lt06QmN3FnscZji0bypUi0,4398
 cmdop/discovery.py,sha256=HNxSOa5tSuG7ppfFs21XdviW5ucjpRswVPguhX5j8Dg,7479
 cmdop/exceptions.py,sha256=-ubepNXXpasXDmlKhl3k0MhWRsI6Oj46Ic_jH4VUw-g,10314
@@ -166,23 +166,27 @@ cmdop/services/base.py,sha256=BCYIUME5gfpDHAief30sQNVzrlAgHx6QGZ6AbLHQx5w,3087
 cmdop/services/extract.py,sha256=zwzikEKH4T4OnrprmJg3wqBWQJr-DYsSZgJGK_2yIHU,11119
 cmdop/services/files.py,sha256=RGhfo7tW6diuUWC_EQQ-Y9zO1btm6mBTji0SWWa0fdo,12548
 cmdop/services/terminal.py,sha256=9SSWBexe2rWgMd-hGBEs9mcax3l7x_U84VHZpMC4xK8,17512
-cmdop/services/browser/__init__.py,sha256=BFdrmtvWEiBztds-YITE-8aW4-7-B8jbsQaPsC1M60g,1475
+cmdop/services/browser/__init__.py,sha256=31Ofu9RCYTAedPKLvnor8J7oGDgTjbqJ58OkxxHYwdk,1270
 cmdop/services/browser/models.py,sha256=qJ3da8hPvQn7Vtiqg3xg49G-GioidQGPPuLk2c_IBC4,2656
 cmdop/services/browser/parsing.py,sha256=0hQAy-0ZwJqtmhEqHO3EEdVB3iYmyhXRdouN_dCbig8,3820
-cmdop/services/browser/aio/__init__.py,sha256=7DI4Q0LZaAdu3fl8D1SaZ8E3LCGpTw97lqca1pOi5Kk,241
-cmdop/services/browser/aio/service.py,sha256=YDn1n6SwZi2SUhooPROjT7WCJX05WFDh71pOSS10KMI,15174
-cmdop/services/browser/aio/session.py,sha256=_aVbEQ8-KJWLC6e-R3DGwS3Stw9WzXyoKXdtOqm3xIU,14431
-cmdop/services/browser/base/__init__.py,sha256=mgG4y324zSDy-13uQiTg6rlFpaQFLc67ynbykRZuMms,227
-cmdop/services/browser/base/service.py,sha256=w8foDUGZcD4HyF5eyLZUFxbx_fctAFsYRovvsksi3l4,1584
-cmdop/services/browser/base/session.py,sha256=5-UiBxG3t5TtATih41JaPR9PdmIKfeICTM1RbhRdBok,3773
-cmdop/services/browser/js/__init__.py,sha256=lb86NItjLKT6GnePAIA7S9Du3G_Fb5aXe12PuKszYmY,1235
+cmdop/services/browser/session.py,sha256=ZFZuzxEUEpwDenigBZdxr5aYePlo69LWre9YIK6LRSM,5363
+cmdop/services/browser/capabilities/__init__.py,sha256=SvaRxAiB8pq671bWtTThVe5BgVg0G-4wAPcgOvu9ab4,334
+cmdop/services/browser/capabilities/_base.py,sha256=mW0jKa2CyvK-8cjenv5JYvuCKiO3rpt5F7WtWFXBitA,749
+cmdop/services/browser/capabilities/_helpers.py,sha256=jXqYbeDocAHec2GwF2_BNnJ78vTyUnHteQoS-RSG00k,488
+cmdop/services/browser/capabilities/dom.py,sha256=DuXfildga23wGBNJWtNzx-t2Cq553HC48o9KAWAlyC0,2612
+cmdop/services/browser/capabilities/fetch.py,sha256=GAjOjk9XkCrMgUzRUrdMmVgOmIClwBWPUnmfA_OqITY,1392
+cmdop/services/browser/capabilities/input.py,sha256=uYmWGqturMDent44Us80oT_nk4kFNGyPJ0P5I35ulew,1749
+cmdop/services/browser/capabilities/scroll.py,sha256=sh0VuOPOv81BZg80-n8TABOj5RpshJT12qJwm4F_OY0,4808
+cmdop/services/browser/capabilities/timing.py,sha256=NH34G_4Kfukh6JCdhLRGoouA-uNTbx9ly7ybP9Kh558,1868
+cmdop/services/browser/js/__init__.py,sha256=gTiZguikKfztDtggZTux2FqhT8YTjyHCzQR4TEnT7z4,1177
 cmdop/services/browser/js/core.py,sha256=QXCCX_al5tMgz7aCwMqhIs1aRe_IdG8teOJniaumA5Q,995
 cmdop/services/browser/js/fetch.py,sha256=WPy_H4LLkneSx06wpfnx4Sx_0Okf2ENXi6bveCd9ZCg,2188
-cmdop/services/browser/js/interaction.py,sha256=zdCy1l833k_a470qm3Q9QLKQrbSQ5tYgTUa4rVGailc,5444
+cmdop/services/browser/js/interaction.py,sha256=qNcs9XwjXZPJfbg8BPeqw5hXya_xTQsHv1T7VWdQ7qY,6620
 cmdop/services/browser/js/scroll.py,sha256=yiOMAaR8ac8jCiWgNCVIt1pUGxdvktMUtzv-AVAE-2Q,7823
-cmdop/services/browser/sync/__init__.py,sha256=sFePvIsWqhaeCU9fw_ZyOITeeEHvZx4Gtcp8W3KBKG0,222
-cmdop/services/browser/sync/service.py,sha256=T-GnxIK2ZmE3KSe5eIsEj63ClQOyxJffxueHtq8BmPI,15467
-cmdop/services/browser/sync/session.py,sha256=5wm5WXAQJFEv1R6B2ku0cNePLLbzEwojWqxSFxSBvw8,21786
+cmdop/services/browser/service/__init__.py,sha256=AZH_r2FsxLfJGCVBaaAPw3dTGaUlgIFdlYd_RR8KxSg,100
+cmdop/services/browser/service/_helpers.py,sha256=w8foDUGZcD4HyF5eyLZUFxbx_fctAFsYRovvsksi3l4,1584
+cmdop/services/browser/service/aio.py,sha256=0E2D4igQb3YzAakdXsRMt8PEd0rFxI2gXfimwq_6nzk,767
+cmdop/services/browser/service/sync.py,sha256=meSoRacS5WVBTABiXopWvTIItzvR7nUiyaxnDuUMoUQ,15466
 cmdop/streaming/__init__.py,sha256=kG9UlJRqv8ndcwKMzWUddPlZT61pFO_Uf_c08A_8TxA,877
 cmdop/streaming/base.py,sha256=r7Q2QlRxgULzs9vlSGcOC_fwAQ_cF3Z3M7WsPQtxG5I,2990
 cmdop/streaming/handlers.py,sha256=FDEhADmCEFRbifvr9dU1X3C-K_96noz89Bl3tuDa_rQ,2616
@@ -193,7 +197,7 @@ cmdop/transport/base.py,sha256=2pkV8i9epgp_21dyReCfX47abRUrnALm0W5BXb-Fuz0,5571
 cmdop/transport/discovery.py,sha256=rcGAuVrR1l6jwcP0dqZxVhX1NsFK7sRHygFMCLmmUbA,10673
 cmdop/transport/local.py,sha256=ob6tWVxSdKwblHSMK8CkgjyuSdQoAeWgy5OAUd5ZNuE,7411
 cmdop/transport/remote.py,sha256=FNVqus9wOv7LlxKarXjLmSyvJiHwhvPbNDOPv1IQkmE,4329
-cmdop-0.1.21.dist-info/METADATA,sha256=Ewv9fVmpTmxU7NWpmQzyEWWB0ce6dBjpJnsuQ-n4mso,7532
-cmdop-0.1.21.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-cmdop-0.1.21.dist-info/licenses/LICENSE,sha256=6hyzbI1QVXW6B-XT7PaQ6UG9lns11Y_nnap8uUKGUqo,1062
-cmdop-0.1.21.dist-info/RECORD,,
+cmdop-0.1.22.dist-info/METADATA,sha256=OTt5H55-dBCDKBLpTJSiNtbsJAz5Wxy9jKTrIb7HTxE,7574
+cmdop-0.1.22.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cmdop-0.1.22.dist-info/licenses/LICENSE,sha256=6hyzbI1QVXW6B-XT7PaQ6UG9lns11Y_nnap8uUKGUqo,1062
+cmdop-0.1.22.dist-info/RECORD,,

cmdop/services/browser/aio/__init__.py

@@ -1,6 +0,0 @@
-"""Asynchronous browser session and service."""
-
-from cmdop.services.browser.aio.session import AsyncBrowserSession
-from cmdop.services.browser.aio.service import AsyncBrowserService
-
-__all__ = ["AsyncBrowserSession", "AsyncBrowserService"]