simplex 1.2.0__tar.gz → 1.2.1__tar.gz

{simplex-1.2.0 → simplex-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simplex
-Version: 1.2.0
+Version: 1.2.1
 Summary: Official Python SDK for Simplex API
 Home-page: https://github.com/shreyka/simplex-python
 Author: Simplex Labs, Inc.

{simplex-1.2.0 → simplex-1.2.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="simplex",
-    version="1.2.0",
+    version="1.2.1",
     packages=find_packages(),
     install_requires=[
         "openai>=1.0.0",

{simplex-1.2.0 → simplex-1.2.1}/simplex/simplex.py

@@ -3,7 +3,6 @@ from PIL import Image
 import requests
 from typing import List
 import io
-import time
 
 from .utils import center_bbox, screenshot_to_image
 
@@ -24,10 +23,13 @@ class Simplex:
         if browser is None:
             self.playwright = sync_playwright().start()
             self.browser = self.playwright.chromium.launch(headless=True)
+            self.driver = self.browser.new_page()
         else:
             self.playwright = None
-            
-        self.driver = self.browser.new_page(viewport={"width": 1280, "height": 720})
+            if len(self.browser.contexts) > 0 and len(self.browser.contexts[0].pages) > 0:
+                self.driver = self.browser.contexts[0].pages[0]
+            else:
+                self.driver = self.browser.new_page()
 
     def find_element(self, element_description: str, state: Image.Image | None = None, annotate: bool = True) -> List[int]:
         """
@@ -56,6 +58,7 @@ class Simplex:
             'element_description': (None, element_description),
             'api_key': (None, self.api_key)
         }        
+
         # Make the request
         response = requests.post(
             endpoint,
@@ -83,20 +86,42 @@ class Simplex:
                         // Create new overlay
                         const overlay = document.createElement('div');
                         overlay.id = 'simplex-bbox-overlay';
-                        overlay.style.position = 'absolute';
-                        overlay.style.border = '2px solid red';
+                        overlay.style.position = 'fixed';
+                        overlay.style.border = '2px dashed rgba(74, 144, 226, 1)';
+                        overlay.style.background = 'rgba(74, 144, 226, 0.1)';
+                        overlay.style.animation = 'marching-ants 0.5s linear infinite';
                         overlay.style.left = bbox[0] + 'px';
                         overlay.style.top = bbox[1] + 'px';
                         overlay.style.width = (bbox[2] - bbox[0]) + 'px';
                         overlay.style.height = (bbox[3] - bbox[1]) + 'px';
                         overlay.style.pointerEvents = 'none';
                         overlay.style.zIndex = '10000';
+                        overlay.style.margin = '0';
+                        overlay.style.padding = '0';
+                        
+                        // Add marching ants animation keyframes
+                        if (!document.querySelector('#marching-ants-keyframes')) {
+                            const style = document.createElement('style');
+                            style.id = 'marching-ants-keyframes';
+                            style.textContent = `
+                                @keyframes marching-ants {
+                                    0% { border-style: dashed; }
+                                    50% { border-style: solid; }
+                                    100% { border-style: dashed; }
+                                }
+                            `;
+                            document.head.appendChild(style);
+                        }
                         
                         document.body.appendChild(overlay);
+
+                        // Remove overlay after 3 second
+                        setTimeout(() => {
+                            overlay.remove();
+                        }, 2000);
                     }
                 """, bbox)
                 self.driver.wait_for_selector('#simplex-bbox-overlay')
-                time.sleep(5)
             return bbox 
         else:
             print("Error:", response.text)
@@ -147,10 +172,16 @@ class Simplex:
             print(response.text)
             return []
         
-    def goto(self, url: str) -> None:
+    def goto(self, url: str, new_tab: bool = False) -> None:
         """
         Navigate to a URL
+
+        Args:
+            url (str): URL to navigate to
+            new_tab (bool): Whether to open a new tab or use the current tab
         """
+        if new_tab:
+            self.driver = self.browser.new_page()
         self.driver.goto(url)
 
     def execute_action(self, action: List[List[str]], state: Image.Image | None = None, annotate: bool = True) -> None:
@@ -178,6 +209,9 @@ class Simplex:
             elif action_type == "TYPE":
                 self.driver.keyboard.type(description)
 
+            elif action_type == "ENTER":
+                self.driver.keyboard.press("Enter")
+
             elif action_type == "SCROLL":
                 self.driver.mouse.wheel(0, int(description))
 

{simplex-1.2.0 → simplex-1.2.1}/simplex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simplex
-Version: 1.2.0
+Version: 1.2.1
 Summary: Official Python SDK for Simplex API
 Home-page: https://github.com/shreyka/simplex-python
 Author: Simplex Labs, Inc.

{simplex-1.2.0 → simplex-1.2.1}/tests/test_local.py

@@ -10,6 +10,7 @@ from PIL import Image
 import time
 import os
 from hyperbrowser import Hyperbrowser
+from hyperbrowser.models.session import CreateSessionParams
 
 from dotenv import load_dotenv
 
@@ -35,15 +36,7 @@ def screenshot_tests():
     print(action)
 
 
-def execute_action_test():
-    playwright = sync_playwright().start()
-    browser = playwright.chromium.launch(headless=False)
-    driver = browser.new_page()
-    
-    simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), driver=driver)
-    simplex.goto("https://www.netflix.com/")
-    actions = [['CLICK', 'email field'], ['TYPE', 'email address']]
-    simplex.execute_action(actions[0])
+
 
 
 def cgtrader_test():
@@ -51,8 +44,8 @@ def cgtrader_test():
     urls = []
 
     with sync_playwright() as p:
-        driver = p.chromium.launch(headless=False).new_page()
-        simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), driver=driver)
+        browser = p.chromium.launch(headless=False)
+        simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), browser=browser)
         simplex.goto("https://www.cgtrader.com/")
 
         for asset in assets:
@@ -60,7 +53,7 @@ def cgtrader_test():
             simplex.do(f"search for {asset}")  
             simplex.do("click on search button")
             simplex.do(f"click on the first product")
-            driver.wait_for_timeout(3000)
+            simplex.driver.wait_for_timeout(3000)
 
             urls.append(simplex.driver.url)
 
@@ -158,15 +151,10 @@ def test_find_element():
 
 
 def test_find_element_2():
-    with sync_playwright() as p:
-        driver = p.chromium.launch(headless=False).new_page(viewport={"width": 1920, "height": 1080})
-        simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), driver=driver)
-        simplex.goto("https://www.cgtrader.com/")
-
-        state = simplex.take_stable_screenshot()
-        bbox = simplex.find_element("search bar")
 
-        print(bbox)
+    simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"))
+    simplex.goto("https://www.cgtrader.com/")
+    simplex.find_element("search bar")
 
 def test_hyperbrowser_integration():
     """Test Simplex integration with Hyperbrowser"""
@@ -174,22 +162,26 @@ def test_hyperbrowser_integration():
     # Initialize Hyperbrowser client
     client = Hyperbrowser(api_key=os.getenv("HYPERBROWSER_API_KEY"))
     
-    # Create a new session
-    session = client.sessions.create()
+    # Create session params with CAPTCHA solving enabled
+    session_params = CreateSessionParams(
+        solve_captchas=True,
+        use_stealth=True  # Recommended when solving CAPTCHAs
+    )
+    
+    # Create a new session with params
+    session = client.sessions.create(session_params)
     ws_endpoint = session.ws_endpoint
 
     try:
         with sync_playwright() as p:
             # Connect browser to Hyperbrowser session
             browser = p.chromium.connect_over_cdp(ws_endpoint)
-            context = browser.new_context()
-            page = context.new_page()
             
             # Initialize Simplex with the Hyperbrowser-connected page
             simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), browser=browser)
             
             # Test basic functionality
-            simplex.goto("https://www.cgtrader.com/")
+            simplex.goto("https://www.turbosquid.com/")
             simplex.do("search for iphone")
             
             # Verify the search worked by finding the search results
@@ -200,7 +192,31 @@ def test_hyperbrowser_integration():
         # Always stop the Hyperbrowser session
         client.sessions.stop(session.id)
 
+
+def execute_action_test():
+    playwright = sync_playwright().start()
+    browser = playwright.chromium.launch(headless=False)
+    simplex = Simplex(api_key=os.getenv("SIMPLEX_API_KEY"), browser=browser)
+    simplex.goto("https://www.mit.edu/")
+    simplex.find_element('search bar')
+    
+    time.sleep(3)
+    
+    # Save HTML content
+    html_content = simplex.driver.content()
+    with open('page.html', 'w', encoding='utf-8') as f:
+        f.write(html_content)
+    
+    # Keep browser open until user interrupts with Ctrl+C
+    try:
+        print("Browser is kept open. Press Ctrl+C to exit...")
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        browser.close()
+        playwright.stop()
+
 if __name__ == "__main__":
-    test_hyperbrowser_integration()
+    execute_action_test()