simplex 1.2.55__tar.gz → 1.2.58__tar.gz

{simplex-1.2.55 → simplex-1.2.58}/PKG-INFO

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

{simplex-1.2.55 → simplex-1.2.58}/setup.py

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

{simplex-1.2.55 → simplex-1.2.58}/simplex/simplex.py

@@ -4,7 +4,7 @@ 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 playwright.sync_api import sync_playwright
@@ -17,8 +17,8 @@ except ImportError:
         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
@@ -61,7 +61,7 @@ class Playwright:
             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"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to click element: {response.json()['error']}")
@@ -81,6 +81,7 @@ class Simplex:
             self.pw = None
         
     def close_session(self):
+        time.sleep(30)
         if PLAYWRIGHT_AVAILABLE and self.pw_browser:
             try:
                 self.pw_browser.close()
@@ -105,12 +106,15 @@ 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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             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[dict | str] = None):
+    def create_session(self, show_in_console: Optional[bool] = True, proxies: Optional[bool] = True, workflow_name: Optional[str] = None, session_data: Optional[dict | str] = None):
+        if self.session_id:
+            raise ValueError("A session is already active. Please close the current session before creating a new one.")
+        
         if session_data:
             if isinstance(session_data, dict):
                 session_data_dict = session_data
@@ -130,7 +134,7 @@ class Simplex:
                 headers={
                     'x-api-key': self.api_key
                 },
-                data={'proxies': proxies, 'session_data': json.dumps(session_data_dict)}
+                data={'proxies': proxies, 'session_data': json.dumps(session_data_dict), 'workflow_name': workflow_name}
             )
         else:
             response = requests.post(
@@ -138,7 +142,7 @@ class Simplex:
                 headers={
                     'x-api-key': self.api_key
                 },
-                data={'proxies': proxies}
+                data={'proxies': proxies, "workflow_name": workflow_name}
             )
         # Check for non-200 status code
         if response.status_code != 200:
@@ -155,7 +159,9 @@ class Simplex:
             self.pw = sync_playwright().start()
         self.connect_url = response_json['connect_url']
         # self.pw_browser = self.pw.chromium.connect_over_cdp(response_json['connect_url'])
-
+        if not "api.simplex.sh" in BASE_URL:
+            livestream_url = f"http://localhost:3000/session/{self.session_id}"
+        
         if show_in_console:
             print(f"Livestream URL: {livestream_url}")
 
@@ -185,12 +191,14 @@ class Simplex:
         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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to goto url: {response.json()['error']}")
 
     def click(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 click with element_description='{element_description}'")
 
@@ -210,12 +218,14 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the click action failed to return a response. Did you set your api_key when creating the Simplex class?")
-        if response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return response.json()["element_clicked"]
         else:
             raise ValueError(f"Failed to click element: {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")
         if not cdp_url and not self.session_id:
             raise ValueError(f"Must call create_session before calling action type with text='{text}'")
 
@@ -233,11 +243,38 @@ class Simplex:
             },
             data=data
         )
-        if response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
+            print(response.json())
             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:
+            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
 
+        response = requests.post(
+            f"{BASE_URL}/reload",
+            headers={
+                'x-api-key': self.api_key
+            },
+            data=data
+        )
+        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():
+            return
+        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:
             raise ValueError("Must call create_session before calling action press_enter")
@@ -258,7 +295,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to press enter: {response.json()['error']}")
@@ -283,7 +320,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to press tab: {response.json()['error']}")
@@ -308,12 +345,14 @@ 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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         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}'")
 
@@ -333,12 +372,14 @@ 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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return response.json()["bbox"]
         else:
             raise ValueError(f"Failed to extract bbox: {response.json()['error']}")
 
     def extract_text(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_text with element_description='{element_description}'")
 
@@ -356,14 +397,17 @@ class Simplex:
             },
             data=data
         )
-        if 'succeeded' not in response.json():
+        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 response.json()["succeeded"]:
-            return response.json()["text"]
+        if "succeeded" in response_json:
+            return response_json["text"]
         else:
-            raise ValueError(f"Failed to extract text: {response.json()['error']}")
+            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}'")
 
@@ -383,7 +427,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return response.json()["image"]
         else:
             raise ValueError(f"Failed to extract image: {response.json()['error']}")
@@ -408,7 +452,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to scroll: {response.json()['error']}")
@@ -433,7 +477,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to wait: {response.json()['error']}")
@@ -550,7 +594,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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to restore login session: {response.json()['error']}")
@@ -561,6 +605,8 @@ class Simplex:
             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
         """
+        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_upload with element_description='{element_description}'")
         
@@ -592,12 +638,14 @@ 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 response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return
         else:
             raise ValueError(f"Failed to click and upload: {response.json()['error']}")
 
     def click_and_download(self, element_description: str):
+        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}'")
         
@@ -616,12 +664,14 @@ class Simplex:
         )
         if 'succeeded' not in response.json():
             raise ValueError(f"It looks like the click_and_download action failed to return a response. Did you set your api_key when creating the Simplex class?")
-        if response.json()["succeeded"]:
+        if "succeeded" in response.json():
             return response.json()["b64"], response.json()["filename"]
         else:
             raise ValueError(f"Failed to click and download: {response.json()['error']}")
     
     def exists(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 exists with element_description='{element_description}'")
 
@@ -642,7 +692,7 @@ 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 response_json['succeeded']:
+        if "succeeded" in response_json:
             return response_json['exists'], response_json['reasoning']
         else:
             raise ValueError(f"Failed to check if element exists: {response_json['error']}")

{simplex-1.2.55 → simplex-1.2.58}/simplex.egg-info/PKG-INFO

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

{simplex-1.2.55 → simplex-1.2.58}/simplex.egg-info/SOURCES.txt

@@ -11,5 +11,4 @@ simplex.egg-info/entry_points.txt
 simplex.egg-info/requires.txt
 simplex.egg-info/top_level.txt
 simplex/deploy/__init__.py
-simplex/deploy/push.py
-tests/test.py
+simplex/deploy/push.py

simplex-1.2.55/tests/test.py

@@ -1,23 +0,0 @@
-from simplex import Simplex
-import os
-from dotenv import load_dotenv
-import time
-from playwright.async_api import Page
-
-import asyncio
-import os
-import dotenv
-
-dotenv.load_dotenv()
-
-async def main():
-    simplex = Simplex(os.getenv("SIMPLEX_API_KEY"))
-
-    simplex.create_session()
-    simplex.goto("https://gmail.com")
-    simplex.type("test@gmail.com")
-    simplex.press_enter()
-    simplex.wait(1000000)
-if __name__ == "__main__":
-    asyncio.run(main())
-