simplex 1.2.54__py3-none-any.whl → 1.2.57__py3-none-any.whl

simplex/simplex.py

@@ -1,6 +1,6 @@
 import requests 
 import atexit
-from typing import Optional
+from typing import Optional, Union
 import os
 import json
 import warnings
@@ -110,7 +110,10 @@ class Simplex:
         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 +133,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 +141,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:
@@ -356,12 +359,13 @@ 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 response_json["succeeded"]:
+            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 cdp_url and not self.session_id:
@@ -555,20 +559,33 @@ class Simplex:
         else:
             raise ValueError(f"Failed to restore login session: {response.json()['error']}")
 
-    def click_and_upload(self, element_description: str, file_path: str):
+    def click_and_upload(self, element_description: str, file_path_or_callable: Union[str, callable]):
+        """
+        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
+        """
         if not self.session_id:
             raise ValueError(f"Must call create_session before calling action click_and_upload with element_description='{element_description}'")
-
-        files = {
-            'file': open(file_path, 'rb')
-        }
         
+        if not isinstance(file_path_or_callable, str) and not callable(file_path_or_callable):
+            raise TypeError("file_path_or_callable must be either a string or a callable, not a " + type(file_path_or_callable).__name__)
+
+        if isinstance(file_path_or_callable, str):
+            files = {
+                'file': open(file_path_or_callable, 'rb')
+            }
+        elif callable(file_path_or_callable):
+            files = {
+                'file': file_path_or_callable()
+            }
+        else:
+            raise ValueError("You must provide either a valid file path or a callable that returns a file-like object.")
         data = {
-            'element_description': element_description
+            'element_description': element_description,
+            'session_id': self.session_id
         }
 
-        data['session_id'] = self.session_id
-
         response = requests.post(
             f"{BASE_URL}/click_and_upload",
             headers={
@@ -583,7 +600,7 @@ class Simplex:
             return
         else:
             raise ValueError(f"Failed to click and upload: {response.json()['error']}")
-    
+
     def click_and_download(self, element_description: str):
         if not self.session_id:
             raise ValueError(f"Must call create_session before calling action click_and_download with element_description='{element_description}'")

{simplex-1.2.54.dist-info → simplex-1.2.57.dist-info}/METADATA

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

simplex-1.2.57.dist-info/RECORD

@@ -0,0 +1,11 @@
+simplex/__init__.py,sha256=L_5i__xt_ZDkr6e-Wx9cr84t9sXpioOT7j01NJYJCTE,75
+simplex/cli.py,sha256=0K_pzoVdF7vfTJPUONhFzzTvjZk2M7FZPpEONjZWJC8,2268
+simplex/simplex.py,sha256=qz9vUcp0HVIN_weBxv_sBCY1pw8LTObR3fcHcU_0gZQ,25413
+simplex/deploy/__init__.py,sha256=_JQ81F_Nu7hSAfMA691gzs6a4-8oZ-buJ9h3Au12BKw,96
+simplex/deploy/push.py,sha256=hRAbtFZaECKnBljaOLQ5nzJ6hk7tZgc1c7QdgxKQFoY,6123
+simplex-1.2.57.dist-info/LICENSE,sha256=Xh0SJjYZfNI71pCNMB40aKlBLLuOB0blx5xkTtufFNQ,1075
+simplex-1.2.57.dist-info/METADATA,sha256=actbMwYSlAmBFJC9spU_A845aGqUEd3VhUhYJWV42os,1045
+simplex-1.2.57.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+simplex-1.2.57.dist-info/entry_points.txt,sha256=3veL2w3c5vxb3dm8I_M8Fs-370n1ZnvD8uu1nSsL7z8,45
+simplex-1.2.57.dist-info/top_level.txt,sha256=cbMH1bYpN0A3gP-ecibPRHasHoqB-01T_2BUFS8p0CE,8
+simplex-1.2.57.dist-info/RECORD,,

simplex-1.2.54.dist-info/RECORD

@@ -1,11 +0,0 @@
-simplex/__init__.py,sha256=L_5i__xt_ZDkr6e-Wx9cr84t9sXpioOT7j01NJYJCTE,75
-simplex/cli.py,sha256=0K_pzoVdF7vfTJPUONhFzzTvjZk2M7FZPpEONjZWJC8,2268
-simplex/simplex.py,sha256=TMZspmze_PUnNyiEb14qFlgDvFFosNNB0JFPIaILrXU,24264
-simplex/deploy/__init__.py,sha256=_JQ81F_Nu7hSAfMA691gzs6a4-8oZ-buJ9h3Au12BKw,96
-simplex/deploy/push.py,sha256=hRAbtFZaECKnBljaOLQ5nzJ6hk7tZgc1c7QdgxKQFoY,6123
-simplex-1.2.54.dist-info/LICENSE,sha256=Xh0SJjYZfNI71pCNMB40aKlBLLuOB0blx5xkTtufFNQ,1075
-simplex-1.2.54.dist-info/METADATA,sha256=njSwU48H0CXrNBjTYVvj8fWS2AQ959ScE06gnUqhpYU,1045
-simplex-1.2.54.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simplex-1.2.54.dist-info/entry_points.txt,sha256=3veL2w3c5vxb3dm8I_M8Fs-370n1ZnvD8uu1nSsL7z8,45
-simplex-1.2.54.dist-info/top_level.txt,sha256=cbMH1bYpN0A3gP-ecibPRHasHoqB-01T_2BUFS8p0CE,8
-simplex-1.2.54.dist-info/RECORD,,