simplex 1.2.36__tar.gz → 1.2.38__tar.gz

{simplex-1.2.36 → simplex-1.2.38}/PKG-INFO

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

{simplex-1.2.36 → simplex-1.2.38}/setup.py

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

{simplex-1.2.36 → simplex-1.2.38}/simplex/cli.py

@@ -63,13 +63,14 @@ def login(website, proxies):
             website = 'https://' + website
             
         animated_print(f"[SIMPLEX] Creating login session for {website}")
-        login_session_url = simplex.create_login_session(website, proxies=proxies)
-        
-        if login_session_url:
-            animated_print("[SIMPLEX] Opening login page in your browser")
-            webbrowser.open_new_tab(login_session_url)
+
+        fileName = simplex.create_login_session(website)
+
+        if fileName:
+            animated_print(f"[SIMPLEX] Login session created and saved to {fileName}")
         else:
-            print(f"{Fore.YELLOW}[SIMPLEX] Warning: No login URL returned from the server{Style.RESET_ALL}")
+            print(f"{Fore.YELLOW}[SIMPLEX] Warning: Session data could not be saved{Style.RESET_ALL}")
+        
     except Exception as e:
         raise click.ClickException(str(e))
 

{simplex-1.2.36 → simplex-1.2.38}/simplex/simplex.py

@@ -1,9 +1,58 @@
 import requests 
 import atexit
 from typing import Optional
+from playwright.sync_api import sync_playwright
+import os
+import json
+
 BASE_URL = "https://api.simplex.sh"
 
-import json
+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
+        )
+
+        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 response.json()["succeeded"]:
+            return
+        else:
+            raise ValueError(f"Failed to click element: {response.json()['error']}")
 
 class Simplex:
     def __init__(self, api_key: str):
@@ -11,6 +60,8 @@ class Simplex:
         self.session_id = None
         atexit.register(self.close_session)
 
+        self.playwright = Playwright(self)
+
     def close_session(self):
         if not self.session_id:
             return
@@ -30,13 +81,33 @@ class Simplex:
             raise ValueError(f"Failed to close session: {response.json()['error']}")
 
     def create_session(self, show_in_console: Optional[bool] = True, proxies: Optional[bool] = True, session_data: Optional[str] = None):
-        response = requests.post(
-            f"{BASE_URL}/create_session",
-            headers={
-                'x-api-key': self.api_key
-            },
-            data={'proxies': proxies, 'session_data': session_data}
-        )
+        if session_data:
+            try:
+                # Try to parse as JSON string first
+                session_data_dict = json.loads(session_data)
+            except json.JSONDecodeError:
+                # If parsing fails, treat as file path
+                try:
+                    with open(session_data, 'r') as f:
+                        session_data_dict = json.load(f)
+                except Exception as e:
+                    raise ValueError(f"Failed to load session data. Input must be valid JSON string or path to JSON file. Error: {str(e)}")
+            print(session_data_dict)
+            response = requests.post(
+                f"{BASE_URL}/create_session",
+                headers={
+                    'x-api-key': self.api_key
+                },
+                data={'proxies': proxies, 'session_data': json.dumps(session_data_dict)}
+            )
+        else:
+            response = requests.post(
+                f"{BASE_URL}/create_session",
+                headers={
+                    'x-api-key': self.api_key
+                },
+                data={'proxies': proxies}
+            )
         # Check for non-200 status code
         if response.status_code != 200:
             raise ValueError(f"Create session request failed with status code {response.status_code}: {response.text}")
@@ -50,7 +121,7 @@ class Simplex:
         if show_in_console:
             print(f"Livestream URL: {livestream_url}")
 
-        return livestream_url
+        return self.session_id, livestream_url
 
     def goto(self, url: str, cdp_url: str = None):
         if not cdp_url and not self.session_id:
@@ -240,12 +311,12 @@ class Simplex:
         else:
             data['session_id'] = self.session_id
 
-        response = requests.get(    
+        response = requests.post(
             f"{BASE_URL}/extract-text",
             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_text action failed to return a response. Did you set your api_key when creating the Simplex class?")
@@ -329,20 +400,78 @@ class Simplex:
         else:
             raise ValueError(f"Failed to wait: {response.json()['error']}")
     
-    def create_login_session(self, url: str, proxies: Optional[bool] = True):
-        response = requests.post(
-            f"{BASE_URL}/create_login_session",
-            headers={
-                'x-api-key': self.api_key
-            },
-            data={'url': url, 'proxies': proxies}
-        )
-        if 'succeeded' not in response.json():
-            raise ValueError(f"It looks like the create_login_session action failed to return a response. Did you set your api_key when creating the Simplex class?")
-        if response.json()["succeeded"]:
-            return response.json()["login_session_url"]
-        else:
-            raise ValueError(f"Failed to create login session: {response.json()['error']}")
+    def create_login_session(self, url: str, save_directory: Optional[str] = None):
+        def get_website_name(url: str) -> str:
+            """Extract website name from URL"""
+            from urllib.parse import urlparse
+            netloc = urlparse(url).netloc
+            # Remove www. if present
+            if netloc.startswith('www.'):
+                netloc = netloc[4:]
+            return netloc.replace(".", "_")
+
+        with sync_playwright() as p:
+            browser = p.chromium.launch(
+                channel="chrome",  
+                headless=False,
+                args=[
+                    '--disable-blink-features=AutomationControlled',
+                    '--disable-automation',
+                ],
+                ignore_default_args=['--enable-automation']
+            )
+            
+            # Create context and pages
+            context = browser.new_context()
+            main_page = context.new_page()
+            main_page.goto(url)
+            
+            # Create control page in same context
+            control_page = context.new_page()
+            control_page.set_content("""
+                <html>
+                <body style="display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background-color: #f5f5f5;">
+                    <button id="capture-btn" style="
+                        padding: 20px 40px;
+                        font-size: 18px;
+                        cursor: pointer;
+                        background-color: #2196F3;
+                        color: white;
+                        border: none;
+                        border-radius: 5px;
+                        box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+                    ">Click here when logged in to capture session</button>
+                </body>
+                </html>
+            """)
+            
+            # Wait for button click using Playwright's wait_for_event
+            control_page.wait_for_selector('#capture-btn')
+            control_page.evaluate("""
+                () => {
+                    return new Promise((resolve) => {
+                        document.getElementById('capture-btn').onclick = () => {
+                            resolve(true);
+                        }
+                    });
+                }
+            """)
+            
+            # Use context.storage_state() instead of browser.storage_state()
+            storage = context.storage_state()
+            if save_directory:
+                filename = os.path.join(save_directory, get_website_name(url) + "_session_data.json")
+            else:
+                filename = get_website_name(url) + "_session_data.json"
+            
+            with open(filename, 'w') as f:
+                json.dump(storage, f, indent=2)
+                
+            print(f"Session data saved to '{filename}'")
+            
+            browser.close()
+
+        return filename
     
     def restore_login_session(self, session_data: str, cdp_url: str = None):
         """
@@ -462,4 +591,4 @@ 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']}")

{simplex-1.2.36 → simplex-1.2.38}/simplex.egg-info/PKG-INFO

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