simplex 1.2.70__tar.gz → 1.2.72__tar.gz

{simplex-1.2.70 → simplex-1.2.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simplex
-Version: 1.2.70
+Version: 1.2.72
 Summary: Official Python SDK for Simplex API
 Home-page: https://simplex.sh
 Author: Simplex Labs, Inc.

{simplex-1.2.70 → simplex-1.2.72}/setup.py

@@ -22,7 +22,7 @@ class PostInstallCommand(install):
 
 setup(
     name="simplex",
-    version="1.2.70",
+    version="1.2.72",
     packages=find_packages(),
     package_data={
         "simplex": ["browser_agent/dom/*.js"],  # Include JS files in the dom directory

{simplex-1.2.70 → simplex-1.2.72}/simplex/simplex.py

@@ -1,10 +1,9 @@
-import requests 
-import atexit
 from typing import Optional, Union
 import os
 import json
 import warnings
-
+import requests
+import time
 try:
     from rebrowser_playwright.sync_api import sync_playwright
     PLAYWRIGHT_AVAILABLE = True
@@ -77,7 +76,6 @@ class Simplex:
     def __init__(self, api_key: str):
         self.api_key = api_key
         self.session_id = None
-        atexit.register(self.close_session)
         if PLAYWRIGHT_AVAILABLE:
             self.pw_browser = None
             self.pw = None
@@ -171,19 +169,18 @@ class Simplex:
 
         return self.session_id, livestream_url
 
-    def goto(self, url: str, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def goto(self, url: str, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action goto with url='{url}'")
         
         if not url.startswith('http://') and not url.startswith('https://'):
             url = 'https://' + url
 
-        data = {'url': url}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'url': url,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/goto",
@@ -199,20 +196,43 @@ class Simplex:
             return
         else:
             raise ValueError(f"Failed to goto url: {response.json()['error']}")
-    
+        
+    def enqueue_actions(self, actions: list):
+        if not self.session_id:
+            raise ValueError(f"Must call create_session before calling action enqueue_actions with actions={actions}")
+        
+        data = {
+            'actions': json.dumps(actions),
+            'session_id': self.session_id,
+        }
 
-    def click(self, element_description: str, cdp_url: str = None):
+        response = requests.post(
+            f"{BASE_URL}/enqueue_actions",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+        if 'succeeded' not in response.json():
+            raise ValueError(f"It looks like the enqueue_actions action failed to return a response. Did you set your api_key when creating the Simplex class?")
+    
+        if response.json()['succeeded']:
+            return
+        else:
+            raise ValueError(f"Failed to enqueue actions: {response.json()['error']}")
+        
+        
+    def click(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action click with element_description='{element_description}'")
 
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/click",
@@ -228,19 +248,17 @@ class Simplex:
         else:
             raise ValueError(f"Failed to click element: {response.json()['error']}")
         
-    def select_dropdown_option(self, element_description: str, cdp_url: str = None):
+    def select_dropdown_option(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action select_from_dropdown with element_description='{element_description}'")
         
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
-
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
         
         response = requests.post(
             f"{BASE_URL}/select_dropdown_option",
@@ -257,19 +275,17 @@ class Simplex:
         else:
             raise ValueError(f"Failed to select dropdown option: {response.json()['error']}")
 
-
-    def scroll_to_element(self, element_description: str, cdp_url: str = None):
+    def scroll_to_element(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action scroll_to_element with element_description='{element_description}'")  
         
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/scroll_to_element",
@@ -285,21 +301,18 @@ class Simplex:
             return
         else:
             raise ValueError(f"Failed to scroll element into view: {response.json()['error']}")
-
-            
         
-    def hover(self, element_description: str, cdp_url: str = None):
+    def hover(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action hover with element_description='{element_description}'")
         
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/hover",
@@ -316,18 +329,17 @@ class Simplex:
         else:
             raise ValueError(f"Failed to hover: {response.json()['error']}")
 
-    def type(self, text: str, cdp_url: str = None):
+    def type(self, text: str, override_fail_state: bool = False):
         if not text or not text.strip():
             raise ValueError("text cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action type with text='{text}'")
 
-        data = {'text': text}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'text': text,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/type",
@@ -339,19 +351,16 @@ class Simplex:
         if response.json()['succeeded']:
             return
         else:
-            raise ValueError(f"Failed to type text: {response.json()['error']}")
-    
+            raise ValueError(f"Failed to type text: {response.json()['error']}")    
 
-    def reload(self, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def reload(self, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError("Must call create_session before calling action reload")
 
-        data = {}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/reload",
@@ -367,16 +376,14 @@ class Simplex:
         else:
             raise ValueError(f"Failed to reload: {response.json()['error']}")
         
-    def press_enter(self, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def press_enter(self, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError("Must call create_session before calling action press_enter")
 
-        data = {}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/press_enter",
@@ -392,16 +399,14 @@ class Simplex:
         else:
             raise ValueError(f"Failed to press enter: {response.json()['error']}")
         
-    def press_tab(self, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def press_tab(self, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError("Must call create_session before calling action press_tab")
 
-        data = {}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/press_tab",
@@ -417,16 +422,14 @@ class Simplex:
         else:
             raise ValueError(f"Failed to press tab: {response.json()['error']}")
         
-    def delete_text(self, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def delete_text(self, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError("Must call create_session before calling action delete_text")
 
-        data = {}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/delete_text",
@@ -442,45 +445,40 @@ class Simplex:
         else:
             raise ValueError(f"Failed to delete text: {response.json()['error']}")
 
-    def extract_bbox(self, element_description: str, cdp_url: str = None):
-        if not element_description or not element_description.strip():
-            raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
-            raise ValueError(f"Must call create_session before calling action extract_bbox with element_description='{element_description}'")
-
-        data = {'element_description': element_description}
+    def bot_tests(self, override_fail_state: bool = False):
+        if not self.session_id:
+            raise ValueError("Must call create_session before calling action bot_tests")
 
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
-        response = requests.get(
-            f"{BASE_URL}/extract-bbox",
+        response = requests.post(
+            f"{BASE_URL}/bot_tests",
             headers={
                 'x-api-key': self.api_key
             },
-            params=data
+            data=data
         )
         if 'succeeded' not in response.json():
-            raise ValueError(f"It looks like the extract_bbox action failed to return a response. Did you set your api_key when creating the Simplex class?")
+            raise ValueError(f"It looks like the bot_tests action failed to return a response. Did you set your api_key when creating the Simplex class?")
         if response.json()['succeeded']:
-            return response.json()["bbox"]
+            return
         else:
-            raise ValueError(f"Failed to extract bbox: {response.json()['error']}")
+            raise ValueError(f"Failed to run bot tests: {response.json()['error']}")
 
-    def extract_text(self, element_description: str, cdp_url: str = None):
+    def extract_text(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action extract_text with element_description='{element_description}'")
 
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/extract-text",
@@ -492,48 +490,20 @@ class Simplex:
         response_json = response.json()
         if 'succeeded' not in response_json:
             raise ValueError(f"It looks like the extract_text action failed to return a response. Did you set your api_key when creating the Simplex class?")
-        if "succeeded" in response_json:
+        if response_json["succeeded"]:
             return response_json["text"]
         else:
             raise ValueError(f"Failed to extract text: {response_json['error']}")
 
-    def extract_image(self, element_description: str, cdp_url: str = None):
-        if not element_description or not element_description.strip():
-            raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
-            raise ValueError(f"Must call create_session before calling action extract_image with element_description='{element_description}'")
-
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
-
-        response = requests.get(
-            f"{BASE_URL}/extract-image",
-            headers={
-                'x-api-key': self.api_key
-            },
-            params=data
-        )
-        if 'succeeded' not in response.json():
-            raise ValueError(f"It looks like the extract_image action failed to return a response. Did you set your api_key when creating the Simplex class?")
-        if response.json()['succeeded']:
-            return response.json()["image"]
-        else:
-            raise ValueError(f"Failed to extract image: {response.json()['error']}")
-
-    def scroll(self, pixels: float, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def scroll(self, pixels: float, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action scroll with pixels={pixels}")
 
-        data = {'pixels': pixels}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'pixels': pixels,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/scroll",
@@ -549,17 +519,15 @@ class Simplex:
         else:
             raise ValueError(f"Failed to scroll: {response.json()['error']}")
 
-    def wait(self, milliseconds: int, cdp_url: str = None):
-        if not cdp_url and not self.session_id:
+    def wait(self, milliseconds: int, override_fail_state: bool = False):
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action wait with milliseconds={milliseconds}")
 
-        data = {'milliseconds': milliseconds}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
-
+        data = {
+            'milliseconds': milliseconds,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
         response = requests.post(
             f"{BASE_URL}/wait",
             headers={
@@ -573,7 +541,7 @@ class Simplex:
             return
         else:
             raise ValueError(f"Failed to wait: {response.json()['error']}")
-    
+        
     def create_login_session(self, url: str, save_directory: Optional[str] = None):
         if not PLAYWRIGHT_AVAILABLE:
             raise ImportError("This feature requires playwright. Install simplex[playwright] to use it.")
@@ -669,17 +637,15 @@ class Simplex:
 
         return filename
 
-    def get_network_response(self, url: str, cdp_url: str = None):
+    def get_network_response(self, url: str):
         print(f"Getting network response for {url}")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action get_network_response with url='{url}'")
         
-        data = {'url': url}
-        
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'url': url,
+            'session_id': self.session_id
+        }
         
         response = requests.post(
             f"{BASE_URL}/get_network_response",
@@ -696,13 +662,12 @@ class Simplex:
         else:
             raise ValueError(f"Failed to get network response: {response.json()['error']}")
 
-    def restore_login_session(self, session_data: str, cdp_url: str = None):
+    def restore_login_session(self, session_data: str):
         """
         Restore a login session from either a file path or a JSON string.
         
         Args:
             session_data: Either a file path to JSON file or a JSON string
-            cdp_url: Optional CDP URL for remote debugging
         """
         try:
             # Try to parse as JSON string first
@@ -716,12 +681,9 @@ class Simplex:
                 raise ValueError(f"Failed to load session data. Input must be valid JSON string or path to JSON file. Error: {str(e)}")
         
         data = {
-            'session_data': json.dumps(session_data_dict)
+            'session_data': json.dumps(session_data_dict),
+            'session_id': self.session_id
         }
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
         
         response = requests.post(
             f"{BASE_URL}/restore_login_session",
@@ -737,11 +699,12 @@ class Simplex:
         else:
             raise ValueError(f"Failed to restore login session: {response.json()['error']}")
 
-    def click_and_upload(self, element_description: str, file_path_or_callable: Union[str, callable]):
+    def click_and_upload(self, element_description: str, file_path_or_callable: Union[str, callable], override_fail_state: bool = False):
         """
         Args:
             element_description: Description of the element to click and upload to
             file_path_or_callable: Either a path to the file to be uploaded or a callable that returns a file-like object in 'rb' mode
+            override_fail_state: Boolean to override fail state, default is False
         """
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
@@ -763,7 +726,8 @@ class Simplex:
             raise ValueError("You must provide either a valid file path or a callable that returns a file-like object.")
         data = {
             'element_description': element_description,
-            'session_id': self.session_id
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
         }
 
         response = requests.post(
@@ -781,18 +745,18 @@ class Simplex:
         else:
             raise ValueError(f"Failed to click and upload: {response.json()['error']}")
 
-    def click_and_download(self, element_description: str):
+    def click_and_download(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
         if not self.session_id:
             raise ValueError(f"Must call create_session before calling action click_and_download with element_description='{element_description}'")
         
         data = {
-            'element_description': element_description
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
         }
 
-        data['session_id'] = self.session_id
-
         response = requests.post(
             f"{BASE_URL}/click_and_download",
             headers={
@@ -829,18 +793,17 @@ class Simplex:
         
         return filename, response.content
     
-    def exists(self, element_description: str, cdp_url: str = None):
+    def exists(self, element_description: str, override_fail_state: bool = False):
         if not element_description or not element_description.strip():
             raise ValueError("element_description cannot be empty")
-        if not cdp_url and not self.session_id:
+        if not self.session_id:
             raise ValueError(f"Must call create_session before calling action exists with element_description='{element_description}'")
 
-        data = {'element_description': element_description}
-
-        if cdp_url:
-            data['cdp_url'] = cdp_url
-        else:
-            data['session_id'] = self.session_id
+        data = {
+            'element_description': element_description,
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
 
         response = requests.post(
             f"{BASE_URL}/exists",
@@ -856,4 +819,50 @@ class Simplex:
         if response_json['succeeded']:
             return response_json['exists'], response_json['reasoning']
         else:
-            raise ValueError(f"Failed to check if element exists: {response_json['error']}")
+            raise ValueError(f"Failed to check if element exists: {response_json['error']}")
+        
+    def capture_login_session(self, override_fail_state: bool = False):
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
+        response = requests.post(
+            f"{BASE_URL}/capture_login_session",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+        if 'succeeded' not in response.json():
+            raise ValueError(f"It looks like the capture_login_session action failed to return a response. Did you set your api_key when creating the Simplex class?")
+        response_json = response.json()
+        if "storage_state" in response_json:
+            print("response keys: ", response_json['storage_state'].keys())
+        # print(response_json)
+        if response_json['succeeded']:
+            return response_json['storage_state']
+        else:
+            raise ValueError(f"Failed to capture login session: {response_json['error']}")
+    
+            
+    def get_page_url(self, override_fail_state: bool = False):
+        data = {
+            'session_id': self.session_id,
+            'override_fail_state': override_fail_state
+        }
+
+        response = requests.post(
+            f"{BASE_URL}/get_page_url",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+        if 'succeeded' not in response.json():
+            raise ValueError(f"It looks like the get_page_url action failed to return a response. Did you set your api_key when creating the Simplex class?")
+        response_json = response.json()
+        # print(response_json)
+        if response_json['succeeded']:
+            return response_json['url']
+        else:
+            raise ValueError(f"Failed to get page url: {response_json['error']}")

{simplex-1.2.70 → simplex-1.2.72}/simplex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simplex
-Version: 1.2.70
+Version: 1.2.72
 Summary: Official Python SDK for Simplex API
 Home-page: https://simplex.sh
 Author: Simplex Labs, Inc.