cmdop 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

cmdop/api/generated/workspaces/workspaces__api__workspaces/sync_client.py

@@ -12,15 +12,20 @@ class SyncWorkspacesWorkspacesAPI:
         """Initialize sync sub-client with shared httpx client."""
         self._client = client
 
-    def invitations_list(self, page: int | None = None, page_size: int | None = None) -> list[PaginatedWorkspaceInvitationList]:
+    def invitations_list(self, ordering: str | None = None, page: int | None = None, page_size: int | None = None, search: str | None = None) -> list[PaginatedWorkspaceInvitationList]:
         """
         List invitations
 
         List all pending invitations for workspaces you manage
         """
         url = "/api/workspaces/invitations/"
-        response = self._client.get(url, params={"page": page if page is not None else None, "page_size": page_size if page_size is not None else None})
-        response.raise_for_status()
+        response = self._client.get(url, params={"ordering": ordering if ordering is not None else None, "page": page if page is not None else None, "page_size": page_size if page_size is not None else None, "search": search if search is not None else None})
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return PaginatedWorkspaceInvitationList.model_validate(response.json())
 
 
@@ -32,7 +37,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = "/api/workspaces/invitations/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceInvitation.model_validate(response.json())
 
 
@@ -44,7 +54,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/invitations/{id}/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceInvitation.model_validate(response.json())
 
 
@@ -56,7 +71,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/invitations/{id}/"
         response = self._client.delete(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def invitations_resend_create(self, id: str, data: WorkspaceInvitationRequest) -> WorkspaceInvitation:
@@ -67,7 +87,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/invitations/{id}/resend/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceInvitation.model_validate(response.json())
 
 
@@ -79,7 +104,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = "/api/workspaces/invitations/accept/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def invitations_decline_create(self, data: WorkspaceInvitationAcceptRequest) -> None:
@@ -90,7 +120,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = "/api/workspaces/invitations/decline/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def invitations_details_retrieve(self, token: str) -> WorkspaceInvitationPublic:
@@ -101,17 +136,27 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/invitations/details/{token}/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceInvitationPublic.model_validate(response.json())
 
 
-    def members_list(self, page: int | None = None, page_size: int | None = None, role: str | None = None, search: str | None = None) -> list[PaginatedWorkspaceMemberList]:
+    def members_list(self, ordering: str | None = None, page: int | None = None, page_size: int | None = None, role: str | None = None, search: str | None = None) -> list[PaginatedWorkspaceMemberList]:
         """
         List workspace members with optional search and role filters.
         """
         url = "/api/workspaces/members/"
-        response = self._client.get(url, params={"page": page if page is not None else None, "page_size": page_size if page_size is not None else None, "role": role if role is not None else None, "search": search if search is not None else None})
-        response.raise_for_status()
+        response = self._client.get(url, params={"ordering": ordering if ordering is not None else None, "page": page if page is not None else None, "page_size": page_size if page_size is not None else None, "role": role if role is not None else None, "search": search if search is not None else None})
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return PaginatedWorkspaceMemberList.model_validate(response.json())
 
 
@@ -122,7 +167,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = "/api/workspaces/members/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceMember.model_validate(response.json())
 
 
@@ -133,7 +183,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/members/{id}/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceMember.model_validate(response.json())
 
 
@@ -144,7 +199,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/members/{id}/"
         response = self._client.put(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceMember.model_validate(response.json())
 
 
@@ -155,7 +215,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/members/{id}/"
         response = self._client.patch(url, json=data.model_dump(exclude_unset=True) if data is not None else None)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceMember.model_validate(response.json())
 
 
@@ -166,7 +231,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/members/{id}/"
         response = self._client.delete(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def members_update_role_create(self, id: str, data: WorkspaceMemberRequest) -> WorkspaceMember:
@@ -177,18 +247,29 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/members/{id}/update-role/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return WorkspaceMember.model_validate(response.json())
 
 
-    def workspaces_list(self) -> None:
+    def workspaces_list(self, ordering: str | None = None, search: str | None = None) -> list[Workspace]:
         """
         ViewSet for Workspace operations. Provides CRUD operations for
         workspaces with team/personal modes.
         """
         url = "/api/workspaces/workspaces/"
-        response = self._client.get(url)
-        response.raise_for_status()
+        response = self._client.get(url, params={"ordering": ordering if ordering is not None else None, "search": search if search is not None else None})
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
+        return [Workspace.model_validate(item) for item in response.json()]
 
 
     def workspaces_create(self, data: WorkspaceCreateRequest) -> Workspace:
@@ -199,7 +280,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = "/api/workspaces/workspaces/"
         response = self._client.post(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return Workspace.model_validate(response.json())
 
 
@@ -210,7 +296,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return Workspace.model_validate(response.json())
 
 
@@ -221,7 +312,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/"
         response = self._client.put(url, json=data.model_dump(exclude_unset=True))
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return Workspace.model_validate(response.json())
 
 
@@ -232,7 +328,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/"
         response = self._client.patch(url, json=data.model_dump(exclude_unset=True) if data is not None else None)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
         return Workspace.model_validate(response.json())
 
 
@@ -243,7 +344,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/"
         response = self._client.delete(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def workspaces_members_retrieve(self, id: str) -> None:
@@ -254,7 +360,12 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/members/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 
     def workspaces_stats_retrieve(self, id: str) -> None:
@@ -265,6 +376,11 @@ class SyncWorkspacesWorkspacesAPI:
         """
         url = f"/api/workspaces/workspaces/{id}/stats/"
         response = self._client.get(url)
-        response.raise_for_status()
+        if not response.is_success:
+            try:
+                error_body = response.json()
+            except Exception:
+                error_body = response.text
+            raise httpx.HTTPStatusError(f"{response.status_code}: {error_body}", request=response.request, response=response)
 
 

cmdop/helpers/__init__.py

@@ -1,7 +1,5 @@
 """CMDOP SDK helpers."""
 
-from cmdop.helpers.formatting import json_to_toon
-from cmdop.helpers.cleaner import JsonCleaner
 from cmdop.helpers.network_analyzer import (
     NetworkAnalyzer,
     NetworkSnapshot,
@@ -9,8 +7,6 @@ from cmdop.helpers.network_analyzer import (
 )
 
 __all__ = [
-    "json_to_toon",
-    "JsonCleaner",
     "NetworkAnalyzer",
     "NetworkSnapshot",
     "RequestSnapshot",

cmdop/helpers/network_analyzer.py

@@ -130,10 +130,10 @@ class NetworkSnapshot(BaseModel):
         return self.model_dump_json(indent=indent)
 
     def best_api(self) -> RequestSnapshot | None:
-        """Get the best data API (most items)."""
+        """Get the best data API (largest response, then most items)."""
         if not self.api_requests:
             return None
-        return max(self.api_requests, key=lambda r: r.item_count or 0)
+        return max(self.api_requests, key=lambda r: (r.size, r.item_count or 0))
 
 
 class NetworkAnalyzer:
@@ -179,7 +179,7 @@ class NetworkAnalyzer:
         clear_initial: bool = True,
         same_origin: bool = True,
         min_size: int = 100,
-        max_size: int = 500_000,
+        max_size: int = 5_000_000,
         countdown_message: str = "Click pagination!",
     ) -> NetworkSnapshot:
         """Capture network requests while user interacts with page.
@@ -230,6 +230,7 @@ class NetworkAnalyzer:
             b.visual.countdown(wait_seconds, countdown_message)
 
             # Get cookies
+            b.visual.toast("Getting cookies...")
             try:
                 cookies = b.get_cookies()
                 snapshot.cookies = {c.name: c.value for c in cookies}
@@ -237,41 +238,54 @@ class NetworkAnalyzer:
                 pass
 
             # Get stats
+            b.visual.toast("Getting network stats...")
             stats = b.network.stats()
             snapshot.total_requests = stats.total_captured
             snapshot.total_bytes = stats.total_bytes
 
-            print(f"\nCaptured {stats.total_captured} requests ({stats.total_bytes} bytes)")
+            b.visual.toast(f"Captured {stats.total_captured} requests")
 
             # Get XHR/Fetch calls
+            b.visual.toast("Filtering XHR/Fetch...")
+            # print("Calling network.filter...", flush=True)
             api_calls = b.network.filter(
                 url_pattern=url_pattern,
                 resource_types=["xhr", "fetch"],
             )
+            # print(f"Filter returned {len(api_calls)} calls", flush=True)
 
             # Filter by domain
+            # print("Filtering by domain...", flush=True)
             if same_origin:
                 api_calls = [
                     call for call in api_calls
                     if base_domain in urlparse(call.request.url).netloc
                 ]
+            # print(f"After domain filter: {len(api_calls)}", flush=True)
+
+            # # Show sizes before filtering
+            # for call in api_calls:
+            #     size = call.response.size if call.response else 0
+            #     print(f"  {call.request.url[:60]}... size={size}", flush=True)
 
             # Filter by response size (ignore tracking pixels and heavy assets)
+            # print(f"Filtering by size ({min_size}-{max_size})...", flush=True)
             api_calls = [
                 call for call in api_calls
                 if call.response and min_size <= call.response.size <= max_size
             ]
+            # print(f"After size filter: {len(api_calls)}", flush=True)
 
-            print(f"Found {len(api_calls)} XHR/Fetch requests (domain: {base_domain}, {min_size}-{max_size} bytes)")
+            # print("Showing toast...", flush=True)
+            b.visual.toast(f"Found {len(api_calls)} API calls")
 
-            # Analyze calls
+            # Analyze calls - all JSON responses are API requests
+            # print(f"Analyzing {len(api_calls)} calls...", flush=True)
             for call in api_calls:
                 req = self._create_snapshot(call, snapshot.cookies)
                 if req:
-                    if req.data_key or (req.item_count and req.item_count > 0):
+                    if req.content_type and "json" in req.content_type:
                         snapshot.api_requests.append(req)
-                    elif req.content_type and "json" in req.content_type:
-                        snapshot.json_requests.append(req)
                     else:
                         snapshot.other_requests.append({
                             "url": call.request.url,
@@ -279,9 +293,14 @@ class NetworkAnalyzer:
                             "status": call.response.status if call.response else None,
                         })
 
+            # print("Analysis done", flush=True)
+
         finally:
+            # print("Disabling network capture...", flush=True)
             b.network.disable()
+            # print("Network disabled", flush=True)
 
+        # print("Returning snapshot", flush=True)
         return snapshot
 
     def _extract_base_domain(self, url: str) -> str:

cmdop/services/browser/capabilities/visual.py

@@ -97,4 +97,4 @@ class VisualCapability(BaseCapability):
             print(f"{i}", end=" ", flush=True)
             time.sleep(1)
 
-        print("done")
+        print("done", flush=True)

cmdop/services/browser/service/sync.py

@@ -45,6 +45,8 @@ class BrowserService(BaseService, BaseServiceMixin):
         headless: bool = False,
         width: int = 1280,
         height: int = 800,
+        block_images: bool = False,
+        block_media: bool = False,
     ) -> "BrowserSession":
         from cmdop._generated.rpc_messages.browser_pb2 import BrowserCreateSessionRequest
         from cmdop.services.browser.session import BrowserSession
@@ -56,6 +58,8 @@ class BrowserService(BaseService, BaseServiceMixin):
             headless=headless,
             width=width,
             height=height,
+            block_images=block_images,
+            block_media=block_media,
         )
         response = self._call_sync(self._get_stub.BrowserCreateSession, request)
 

{cmdop-0.1.24.dist-info → cmdop-0.1.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdop
-Version: 0.1.24
+Version: 0.1.26
 Summary: Python SDK for CMDOP agent interaction
 Project-URL: Homepage, https://cmdop.com
 Project-URL: Documentation, https://cmdop.com
@@ -19,17 +19,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: beautifulsoup4>=4.12.0
 Requires-Dist: grpcio>=1.60.0
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: lxml>=5.0.0
 Requires-Dist: protobuf>=4.25.0
 Requires-Dist: pydantic-settings>=2.0.0
 Requires-Dist: pydantic>=2.5.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: toon-python>=0.1.2
 Provides-Extra: dev
-Requires-Dist: beautifulsoup4>=4.12.0; extra == 'dev'
 Requires-Dist: grpcio-tools>=1.60.0; extra == 'dev'
 Requires-Dist: mypy>=1.8.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23.0; extra == 'dev'
@@ -91,8 +88,28 @@ with client.browser.create_session(headless=False) as s:
     s.get_page_info()    # Full page info
     s.get_cookies()
     s.set_cookies([...])
+
+# Fast mode: block images and media for faster page loads
+with client.browser.create_session(
+    block_images=True,
+    block_media=True,
+) as s:
+    s.navigate("https://shop.com/catalog")
+    items = s.dom.extract(".product-title")
 ```
 
+**`create_session` parameters:**
+| Parameter | Default | Description |
+|-----------|---------|-------------|
+| `start_url` | `None` | Initial URL to navigate to |
+| `provider` | `"camoufox"` | Browser provider (`"camoufox"` or `"rod"`) |
+| `profile_id` | `None` | Profile ID for session persistence (cookies, localStorage) |
+| `headless` | `False` | Run browser without UI |
+| `width` | `1280` | Viewport width |
+| `height` | `800` | Viewport height |
+| `block_images` | `False` | Disable loading images (set at launch, cannot change at runtime) |
+| `block_media` | `False` | Disable loading audio/video (set at launch, cannot change at runtime) |
+
 **WaitUntil options:**
 | Value | Description |
 |-------|-------------|
@@ -143,8 +160,6 @@ s.timing.timeout(fn, 10, cleanup)  # Run with timeout
 ```python
 s.dom.html(".container")           # Get HTML
 s.dom.text(".title")               # Get text
-s.dom.soup(".items")               # → SoupWrapper (chainable BS4)
-s.dom.parse(html_string)           # → BeautifulSoup
 s.dom.extract(".items", "href")    # Get attr list
 s.dom.select("#country", "US")     # Dropdown select
 s.dom.close_modal()                # Close dialogs/popups
@@ -302,18 +317,13 @@ class Product(SDKBaseModel):
 products = Product.from_list(raw["items"])  # Auto dedupe + filter
 ```
 
-## Utilities
+## Logging
 
 ```python
-from cmdop import get_logger, json_to_toon
+from cmdop import get_logger
 
-# Logging (rich console + file)
 log = get_logger(__name__)
-log.info("Starting")
-
-# TOON format (30-50% token savings)
-toon = json_to_toon({"name": "Alice", "age": 25})
-# → "name: Alice\nage: 25"
+log.info("Starting")  # Rich console + file output
 ```
 
 ## Requirements