clerk-sdk 0.4.15__tar.gz → 0.4.16.dev0__tar.gz

{clerk_sdk-0.4.15/clerk_sdk.egg-info → clerk_sdk-0.4.16.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clerk-sdk
-Version: 0.4.15
+Version: 0.4.16.dev0
 Summary: Library for interacting with Clerk
 Home-page: https://github.com/F-ONE-Group/clerk_pypi
 Author: F-ONE Group

{clerk_sdk-0.4.15 → clerk_sdk-0.4.16.dev0}/clerk/__init__.py

@@ -1,4 +1,4 @@
 from .client import Clerk
 
 
-__version__ = "0.4.14"
+__version__ = "0.4.16.dev0"

{clerk_sdk-0.4.15 → clerk_sdk-0.4.16.dev0}/clerk/gui_automation/decorators/gui_automation.py

@@ -2,7 +2,7 @@ import asyncio
 import functools
 import os
 import time
-from typing import Callable, Union
+from typing import Any, Callable, Dict, Sequence, Union
 
 from websockets.asyncio.client import connect, ClientConnection
 from websockets.protocol import State
@@ -24,13 +24,6 @@ global_ws: Union[ClientConnection, None] = None
 clerk_client = RPAClerk()
 wss_uri = "wss://agent-manager.f-one.group/action"
 
-REMOTE_DEVICE_ALLOCATION_TIMEOUT = int(
-    os.getenv("REMOTE_DEVICE_ALLOCATION_TIMEOUT", 60)
-)
-REMOTE_DEVICE_ALLOCATION_MAX_TRIES = int(
-    os.getenv("REMOTE_DEVICE_ALLOCATION_MAX_TRIES", 60)
-)
-
 
 async def connect_to_ws(uri: str) -> ClientConnection:
     # Same knobs as before, just via the new connect()
@@ -54,46 +47,7 @@ async def reconnect_ws():
     global_ws = await connect_to_ws(uri)
 
 
-def _allocate_remote_device(
-    clerk_client: RPAClerk, group_name: str, run_id: str
-) -> RemoteDevice:
-    remote_device = None
-    retries = 0
-
-    while True:
-        try:
-            remote_device = clerk_client.allocate_remote_device(
-                group_name=group_name, run_id=run_id
-            )
-            os.environ["REMOTE_DEVICE_ID"] = remote_device.id
-            os.environ["REMOTE_DEVICE_NAME"] = remote_device.name
-            logger.debug(f"Remote device allocated: {remote_device.name}")
-            return remote_device
-
-        except NoClientsAvailable:
-            logger.warning(
-                f"No clients are available for {group_name} group. Initiating a {REMOTE_DEVICE_ALLOCATION_TIMEOUT} seconds wait. Retry count: {retries}"
-            )
-            if retries >= REMOTE_DEVICE_ALLOCATION_MAX_TRIES:
-                raise ClientAvailabilityTimeout(
-                    f"No clients available for {group_name} group after {REMOTE_DEVICE_ALLOCATION_TIMEOUT * REMOTE_DEVICE_ALLOCATION_MAX_TRIES} seconds"
-                )
-            time.sleep(REMOTE_DEVICE_ALLOCATION_TIMEOUT)
-            retries += 1
-
-
-def _deallocate_target(
-    clerk_client: RPAClerk, remote_device: RemoteDevice, run_id: str
-):
-    clerk_client.deallocate_remote_device(remote_device=remote_device, run_id=run_id)
-    logger.debug("Remote device deallocated")
-    os.environ.pop("REMOTE_DEVICE_ID", None)
-    os.environ.pop("REMOTE_DEVICE_NAME", None)
-
-
-def gui_automation(
-    reserve_client: bool = False,
-):
+def gui_automation():
     """
     Decorator that:
       • Allocates a remote device,
@@ -101,22 +55,22 @@ def gui_automation(
       • Passes control to the wrapped function,
       • Cleans everything up afterwards.
     """
-    group_name: str | None = os.getenv("REMOTE_DEVICE_GROUP")
-    if not group_name:
-        raise ValueError("REMOTE_DEVICE_GROUP environmental variable is required.")
+    remote_device_name: str | None = os.getenv("REMOTE_DEVICE_NAME")
+
+    if not remote_device_name:
+        raise ValueError("REMOTE_DEVICE_NAME environmental variable is required.")
+
+    wss_token = clerk_client.get_wss_token()
 
     def decorator(func: Callable):
         @functools.wraps(func)
-        def wrapper(payload: ClerkCodePayload, *args, **kwargs):
+        def wrapper(
+            payload: ClerkCodePayload, *args: Sequence[Any], **kwargs: Dict[str, Any]
+        ):
             global global_ws
 
-            force_deallocate = False
             os.environ["_document_id"] = payload.document.id
-            os.environ["_run_id"] = payload.run_id
-
-            remote_device = _allocate_remote_device(
-                clerk_client, group_name, payload.run_id
-            )
+            os.environ["_run_id"] = payload.run_id or ""
 
             # Create a dedicated loop for the WebSocket work
             event_loop = asyncio.new_event_loop()
@@ -125,8 +79,8 @@ def gui_automation(
             try:
                 task = event_loop.create_task(
                     connect_to_ws(
-                        f"{wss_uri}/{remote_device.name}/publisher"
-                        f"?token={remote_device.wss_token}"
+                        f"{wss_uri}/{remote_device_name}/publisher"
+                        f"?token={wss_token}"
                     )
                 )
                 global_ws = event_loop.run_until_complete(task)
@@ -138,18 +92,11 @@ def gui_automation(
                     global_ws = None
                     raise WebSocketConnectionFailed()
 
-            except Exception as e:
-                force_deallocate = True
+            except Exception:
                 raise
             finally:
                 os.environ.pop("_run_id", None)
                 os.environ.pop("_document_id", None)
-                if not reserve_client or force_deallocate:
-                    _deallocate_target(clerk_client, remote_device, payload.run_id)
-                else:
-                    logger.warning(
-                        f"The client stayed reserved for the this run id: {payload.run_id}"
-                    )
 
                 if global_ws and global_ws.state is State.OPEN:
                     close_task = event_loop.create_task(close_ws_connection(global_ws))

{clerk_sdk-0.4.15 → clerk_sdk-0.4.16.dev0/clerk_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clerk-sdk
-Version: 0.4.15
+Version: 0.4.16.dev0
 Summary: Library for interacting with Clerk
 Home-page: https://github.com/F-ONE-Group/clerk_pypi
 Author: F-ONE Group

{clerk_sdk-0.4.15 → clerk_sdk-0.4.16.dev0}/setup.py

@@ -13,7 +13,7 @@ gui_requirements = get_requirements("./clerk/gui_automation")
 
 setup(
     name="clerk-sdk",
-    version="0.4.15",
+    version="0.4.16.dev0",
     description="Library for interacting with Clerk",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",