clerk-sdk 0.2.0__tar.gz → 0.2.2__tar.gz

{clerk_sdk-0.2.0/clerk_sdk.egg-info → clerk_sdk-0.2.2}/PKG-INFO

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

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/gui_automation/client.py

@@ -3,6 +3,7 @@ from typing import Dict, List, Optional
 from pydantic import BaseModel
 from clerk.base import BaseClerk
 from clerk.gui_automation.action_model.model import Coords
+from clerk.gui_automation.exceptions.agent_manager import NoClientsAvailable
 from clerk.gui_automation.ui_state_inspector.models import (
     ActionString,
     BaseState,
@@ -22,6 +23,9 @@ class RPAClerk(BaseClerk):
             endpoint=endpoint, json={"group_name": group_name, "run_id": run_id}
         )
 
+        if res.data[0] is None:
+            raise NoClientsAvailable()
+
         return RemoteDevice(**res.data[0])
 
     def deallocate_remote_device(

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/gui_automation/client_actor/client_actor.py

@@ -68,9 +68,7 @@ async def _get_screen_async() -> str:
     payload = {
         "proc_inst_id": os.getenv("PROC_ID"),
         "client_name": os.getenv("REMOTE_DEVICE_NAME"),
-        "headless": (
-            True if os.getenv("HEADLESS", "True").lower() == "true" else False
-        ),
+        "headless": True,
         "action": {"action_type": "screenshot"},
     }
     try:

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/gui_automation/decorators/gui_automation.py

@@ -1,15 +1,20 @@
 import asyncio
 import functools
-import logging
 import os
+import time
 from typing import Callable, Union
 
 from websockets.asyncio.client import connect, ClientConnection
 from websockets.protocol import State
 
 from clerk.gui_automation.client import RPAClerk
+from clerk.gui_automation.exceptions.agent_manager import (
+    ClientAvailabilityTimeout,
+    NoClientsAvailable,
+)
 from clerk.models.remote_device import RemoteDevice
 from clerk.decorator.models import ClerkCodePayload
+from clerk.utils import logger
 from ..exceptions.websocket import WebSocketConnectionFailed
 
 
@@ -19,22 +24,43 @@ global_ws: Union[ClientConnection, None] = None
 clerk_client = RPAClerk()
 wss_uri = "wss://agent-manager.f-one.group/action"
 
+CLIENT_TIMEOUT_MINS = 1
+MAX_CLIENT_AVAILABILITY_RETRIES = 60
+
 
 def _allocate_remote_device(
     clerk_client: RPAClerk, group_name: str, run_id: str
 ) -> RemoteDevice:
-    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
-    return remote_device
+    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 {CLIENT_TIMEOUT_MINS} minute wait. Retry count: {retries}"
+            )
+            retries += 1
+            if retries == MAX_CLIENT_AVAILABILITY_RETRIES:
+                raise ClientAvailabilityTimeout(
+                    f"No clients available for {group_name} group after {CLIENT_TIMEOUT_MINS*MAX_CLIENT_AVAILABILITY_RETRIES} minutes"
+                )
+            time.sleep(CLIENT_TIMEOUT_MINS * 60)
 
 
 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)
 
@@ -82,7 +108,7 @@ def gui_automation():
                 global_ws = event_loop.run_until_complete(task)
 
                 if global_ws and global_ws.state is State.OPEN:
-                    logging.debug("WebSocket connection established.")
+                    logger.debug("WebSocket connection established.")
                     func_ret = func(payload, *args, **kwargs)
                 else:
                     global_ws = None
@@ -97,7 +123,7 @@ def gui_automation():
                 if global_ws and global_ws.state is State.OPEN:
                     close_task = event_loop.create_task(close_ws_connection(global_ws))
                     event_loop.run_until_complete(close_task)
-                    print("WebSocket connection closed.")
+                    logger.debug("WebSocket connection closed.")
 
                 event_loop.run_until_complete(event_loop.shutdown_asyncgens())
                 event_loop.close()

clerk_sdk-0.2.2/clerk/gui_automation/exceptions/agent_manager.py

@@ -0,0 +1,6 @@
+class NoClientsAvailable(Exception):
+    pass
+
+
+class ClientAvailabilityTimeout(Exception):
+    pass

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/gui_automation/ui_actions/support.py

@@ -1,4 +1,5 @@
 import os
+import base64
 from typing import Optional
 from backoff._typing import Details
 
@@ -48,7 +49,7 @@ def save_screenshot(filename: str, sub_folder: Optional[str] = None) -> str:
     screen_b64: str = get_screen()
     return save_artifact(
         filename=filename,
-        file_bytes=screen_b64.encode("utf-8"),
+        file_bytes=base64.b64decode(screen_b64),
         subfolder=sub_folder,
     )
 

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/utils/logger.py

@@ -4,7 +4,7 @@ import logging
 import sys
 
 if sys.platform == "win32":
-    base_path = os.path.join(os.getcwd(), "data", "output", "artifacts")
+    base_path = os.path.join(os.getcwd(), "data", "artifacts")
 else:
     base_path = "/app/data/artifacts"
 
@@ -100,7 +100,13 @@ def _log(level: str, message: str):
         formatter = logging.Formatter(format)
         fh.setFormatter(formatter)
         logger.addHandler(fh)
+        # → console handler  (same formatter)
+        sh = logging.StreamHandler(sys.stdout)
+        sh.setFormatter(formatter)
+        logger.addHandler(sh)
+
     logger.setLevel(logging.DEBUG)
+    logger.propagate = False  # keep root logger from printing duplicates
 
     # Log the message based on the level
     if level.lower() == "info":

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk/utils/save_artifact.py

@@ -1,5 +1,6 @@
 import os
 from typing import Optional
+from clerk.utils import logger
 
 
 def save_artifact(
@@ -32,4 +33,5 @@ def save_artifact(
     with open(file_path, "wb") as f:
         f.write(file_bytes)
 
+    logger.debug(f"Artifact successfully saved at: {file_path}")
     return file_path

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2/clerk_sdk.egg-info}/PKG-INFO

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

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/clerk_sdk.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ clerk/gui_automation/client_actor/model.py
 clerk/gui_automation/decorators/__init__.py
 clerk/gui_automation/decorators/gui_automation.py
 clerk/gui_automation/exceptions/__init__.py
+clerk/gui_automation/exceptions/agent_manager.py
 clerk/gui_automation/exceptions/websocket.py
 clerk/gui_automation/exceptions/modality/__init__.py
 clerk/gui_automation/exceptions/modality/exc.py

{clerk_sdk-0.2.0 → clerk_sdk-0.2.2}/setup.py

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