simplex 1.2.63__tar.gz → 1.2.65__tar.gz

{simplex-1.2.63 → simplex-1.2.65}/PKG-INFO

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

{simplex-1.2.63 → simplex-1.2.65}/setup.py

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

{simplex-1.2.63 → simplex-1.2.65}/simplex/simplex.py

@@ -4,67 +4,29 @@ from typing import Optional, Union
 import os
 import json
 import warnings
-import time
-# Try to import playwright, but don't fail if it's not available (lite version)
+
 try:
     from rebrowser_playwright.sync_api import sync_playwright
     PLAYWRIGHT_AVAILABLE = True
 except ImportError:
-    PLAYWRIGHT_AVAILABLE = False
-    warnings.warn(
-        "Playwright is not available. Some features will be disabled. "
-        "To enable all features, install with 'pip install simplex[playwright]'",
-        ImportWarning
-    )
-
-# BASE_URL = "https://simplex-dev--api-server-fastapi-app.modal.run"
-BASE_URL = "https://api.simplex.sh"
-class Playwright:
-    def __init__(self, simplex_instance):
-        self.simplex = simplex_instance
-        
-    def click(self, locator: str, locator_type: str, exact: Optional[bool] = False, 
-              element_index: Optional[str] = None, nth_index: Optional[int] = None, 
-              locator_options: Optional[dict] = None):
-        
-        if element_index and element_index not in ["first", "last", "nth"]:
-            raise ValueError("element_index must be 'first', 'last', or 'nth'")
-        
-        if element_index=="nth" and not nth_index:
-            raise ValueError("nth_index is required when element_index is 'nth'")
-        
-        data = {
-            'session_id': self.simplex.session_id,
-            'locator': locator,
-            'locator_type': locator_type,
-        }     
-        
-        if element_index:
-            data['element_index'] = element_index
-            data['nth_index'] = nth_index
-
-        if exact:
-            data['exact'] = exact
-            
-        if locator_options:
-            data['locator_options'] = json.dumps(locator_options)
-
-        response = requests.post(
-            f"{BASE_URL}/playwright/click",
-            headers={
-                'x-api-key': self.simplex.api_key
-            },
-            data=data
+    try:
+        from playwright.sync_api import sync_playwright
+        PLAYWRIGHT_AVAILABLE = True
+        warnings.warn(
+            "Using standard playwright instead of rebrowser-patches. Some anti-bot systems may detect automation. "
+            "To improve stealth, install with 'pip install rebrowser-playwright'",
+            ImportWarning
+        )
+    except ImportError:
+        PLAYWRIGHT_AVAILABLE = False
+        warnings.warn(
+            "Playwright is not available. Some features will be disabled. "
+            "To enable all features, install with 'pip install simplex[playwright]'",
+            ImportWarning
         )
 
-        if 'succeeded' not in response.json():
-            print(response.json())
-            raise ValueError(f"It looks like the click action with playwright failed to return a response. Did you set your api_key when creating the Simplex class?")
-        
-        if "succeeded" in response.json():
-            return
-        else:
-            raise ValueError(f"Failed to click element: {response.json()['error']}")
+BASE_URL = "https://simplex-dev--api-server-and-container-service-fastapi-app.modal.run"
+# BASE_URL = "https://api.simplex.sh"
 
 class Simplex:
     def __init__(self, api_key: str):
@@ -72,11 +34,9 @@ class Simplex:
         self.session_id = None
         atexit.register(self.close_session)
         if PLAYWRIGHT_AVAILABLE:
-            self.playwright = Playwright(self)
             self.pw_browser = None
             self.pw = None
         else:
-            self.playwright = None
             self.pw_browser = None
             self.pw = None
         
@@ -105,7 +65,7 @@ class Simplex:
         self.session_id = None
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the close_session 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
         else:
             raise ValueError(f"Failed to close session: {response.json()['error']}")
@@ -187,10 +147,11 @@ class Simplex:
             },
             data=data
         )
+
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the goto 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
         else:
             raise ValueError(f"Failed to goto url: {response.json()['error']}")
@@ -222,6 +183,65 @@ class Simplex:
         else:
             raise ValueError(f"Failed to click element: {response.json()['error']}")
 
+
+    def scroll_to_element(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 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
+
+        response = requests.post(
+            f"{BASE_URL}/scroll_to_element",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+
+        if 'succeeded' not in response.json():
+            raise ValueError(f"It looks like the scroll_to_element 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 scroll element into view: {response.json()['error']}")
+
+            
+        
+    def hover(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 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
+
+        response = requests.post(
+            f"{BASE_URL}/hover",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+        if 'succeeded' not in response.json():  
+            raise ValueError(f"It looks like the hover 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 hover: {response.json()['error']}")
+
     def type(self, text: str, cdp_url: str = None):
         if not text or not text.strip():
             raise ValueError("text cannot be empty")
@@ -242,10 +262,9 @@ class Simplex:
             },
             data=data
         )
-        if "succeeded" in response.json():
+        if response.json()['succeeded']:
             return
         else:
-            print(response.json())
             raise ValueError(f"Failed to type text: {response.json()['error']}")
     
 
@@ -269,7 +288,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the reload 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
         else:
             raise ValueError(f"Failed to reload: {response.json()['error']}")
@@ -294,7 +313,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the press_enter 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
         else:
             raise ValueError(f"Failed to press enter: {response.json()['error']}")
@@ -319,7 +338,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the press_tab 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
         else:
             raise ValueError(f"Failed to press tab: {response.json()['error']}")
@@ -344,7 +363,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the delete_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
         else:
             raise ValueError(f"Failed to delete text: {response.json()['error']}")
@@ -371,7 +390,7 @@ class Simplex:
         )
         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?")
-        if "succeeded" in response.json():
+        if response.json()['succeeded']:
             return response.json()["bbox"]
         else:
             raise ValueError(f"Failed to extract bbox: {response.json()['error']}")
@@ -426,7 +445,7 @@ class Simplex:
         )
         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 "succeeded" in response.json():
+        if response.json()['succeeded']:
             return response.json()["image"]
         else:
             raise ValueError(f"Failed to extract image: {response.json()['error']}")
@@ -451,7 +470,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the scroll 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
         else:
             raise ValueError(f"Failed to scroll: {response.json()['error']}")
@@ -476,7 +495,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the wait 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
         else:
             raise ValueError(f"Failed to wait: {response.json()['error']}")
@@ -495,24 +514,23 @@ class Simplex:
             return netloc.replace(".", "_")
 
         with sync_playwright() as p:
-            context = p.chromium.launch_persistent_context(
+            browser = p.chromium.launch(
                 channel="chrome",  
                 headless=False,
                 args=[
                     '--disable-blink-features=AutomationControlled',
                     '--disable-automation',
                 ],
-                ignore_default_args=['--enable-automation'],
-                user_data_dir="/home/simplex/.config/google-chrome/Profile 1/",
-                user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-                viewport={"width": 1243, "height": 681}
+                ignore_default_args=['--enable-automation']
             )
-            main_page = context.pages[0]
-            main_page.goto(url, wait_until="networkidle")
-
-            # # Create control page in same context
+            # Create context and pages
+            context = browser.new_context(viewport=None)
+            main_page = context.new_page()
+            main_page.goto(url)
+            
+            # Create control page in same context
             control_page = context.new_page()
-             # Use a simple HTML file instead of set_content
+            # Use a simple HTML file instead of set_content
             html_content = """
             <!DOCTYPE html>
             <html>
@@ -560,6 +578,7 @@ class Simplex:
                     os.unlink(temp_path)
                 except:
                     pass
+            
             # Use context.storage_state() instead of browser.storage_state()
             storage = context.storage_state()
             if save_directory:
@@ -572,9 +591,37 @@ class Simplex:
                 
             print(f"Session data saved to '{filename}'")
             
-            context.close()
-        # return filename
-    
+            browser.close()
+
+        return filename
+
+    def get_network_response(self, url: str, cdp_url: str = None):
+        print(f"Getting network response for {url}")
+        if not cdp_url and 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
+        
+        response = requests.post(
+            f"{BASE_URL}/get_network_response",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+
+        if 'status' not in response.json():
+            raise ValueError(f"It looks like the get_network_response action failed to return a response. Did you set your api_key when creating the Simplex class?")
+        if response.json()['status'] == 'success':
+            return response.json()['response']
+        else:
+            raise ValueError(f"Failed to get network response: {response.json()['error']}")
+
     def restore_login_session(self, session_data: str, cdp_url: str = None):
         """
         Restore a login session from either a file path or a JSON string.
@@ -611,7 +658,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the restore_login_session 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
         else:
             raise ValueError(f"Failed to restore login session: {response.json()['error']}")
@@ -655,7 +702,7 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the click_and_upload 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
         else:
             raise ValueError(f"Failed to click and upload: {response.json()['error']}")
@@ -726,7 +773,8 @@ class Simplex:
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the exists action failed to return a response. Did you set your api_key when creating the Simplex class?")
         response_json = response.json()
-        if "succeeded" in response_json:
+        
+        if response_json['succeeded']:
             return response_json['exists'], response_json['reasoning']
         else:
             raise ValueError(f"Failed to check if element exists: {response_json['error']}")

{simplex-1.2.63 → simplex-1.2.65}/simplex.egg-info/PKG-INFO

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