intuned-runtime 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

intuned_internal_cli/commands/project/run_interface.py

@@ -2,18 +2,21 @@ import asyncio
 import os
 import signal
 import socket
+import sys
 import time
 from collections.abc import AsyncGenerator
+from pathlib import Path
 from typing import Any
 from typing import cast
 from typing import Literal
 
-import arguably
 from pydantic import Field
 from pydantic import ValidationError
 
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.backend_functions import get_auth_session_parameters
 from runtime.context import IntunedContext
+from runtime.errors.run_api_errors import ApiNotFoundError
 from runtime.errors.run_api_errors import InternalInvalidInputError
 from runtime.errors.run_api_errors import RunApiError
 from runtime.run.run_api import import_function_from_api_dir
@@ -69,15 +72,18 @@ class MessageWrapper(CamelBaseModel):
     )
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__run_interface(
     socket_path: str,
+    *,
+    jsonl: bool = False,
 ):
     """
     Runs the current project. Project must contain an "api" directory with API functions.
 
     Args:
         socket_path (str): Path to the socket file.
+        jsonl (bool, optional): Use a JSONL client instead of socket. Defaults to False.
 
     """
 
@@ -86,7 +92,7 @@ async def project__run_interface(
         raise Exception("socket_path is required")
 
     timeout_timestamp = time.time()
-    client = UDASClient(socket_path)
+    client = SocketClient(socket_path) if not jsonl else JSONLFileClient(socket_path)
     connected = await client.connect()
     if not connected:
         raise Exception("Failed to connect to UDAS")
@@ -97,7 +103,9 @@ async def project__run_interface(
 
     def done(exitCode: int = 0):
         client.close()
-        exit(exitCode)
+        loop.remove_signal_handler(signal.SIGTERM)
+        loop.remove_signal_handler(signal.SIGINT)
+        sys.exit(exitCode)
 
     def interrupt_signal_handler():
         async def _impl():
@@ -133,6 +141,11 @@ async def project__run_interface(
         asyncio.Task[RunAutomationSuccessResult] | None, None
     )
 
+    def import_function(file_path: str, automation_name: str | None = None):
+        return import_function_from_api_dir(
+            automation_function_name=automation_name, file_path=file_path, base_dir=os.getcwd()
+        )
+
     async def handle_message(message: Message):
         nonlocal run_api_task
         if message.type == "start":
@@ -151,9 +164,7 @@ async def project__run_interface(
             run_api_task = asyncio.create_task(
                 run_api(
                     message.parameters,
-                    import_function=lambda file_path, automation_name=None: import_function_from_api_dir(
-                        automation_function_name=automation_name, file_path=file_path, base_dir=os.getcwd()
-                    ),
+                    import_function=import_function,
                 ),
             )
             return
@@ -191,6 +202,14 @@ async def project__run_interface(
                 await client.send_message({"type": "done", "success": False, "result": message.json})
                 break
             if message.type == "ping":
+                api_files = await get_python_files_from_dir(Path() / "api")
+                apis = [f'api/{str(p.with_suffix("").as_posix())}' for p in api_files]
+
+                for api in [*apis, "auth-sessions/create", "auth-sessions/check"]:
+                    try:
+                        import_function(api)
+                    except ApiNotFoundError:
+                        pass
                 await client.send_message({"type": "pong"})
                 break
             await handle_message(message)
@@ -231,7 +250,7 @@ async def project__run_interface(
     done()
 
 
-class UDASClient:
+class SocketClient:
     def __init__(self, socket_path: str):
         self.socket_path = socket_path
         self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -263,3 +282,51 @@ class UDASClient:
             return
         self.sock.shutdown(socket.SHUT_RDWR)
         self.sock.close()
+
+
+class JSONLFileClient(SocketClient):
+    def __init__(self, socket_path: str):
+        self.socket_path = socket_path
+        self.fp = None
+
+    async def connect(self):
+        if not os.path.exists(self.socket_path):
+            return False
+        self.fp = open(self.socket_path, "r+b", buffering=0)
+        return True
+
+    def receive_messages(self) -> AsyncGenerator[dict[str, Any], None]:
+        import json
+
+        async def generator():
+            if self.fp is None:
+                raise Exception("Socket not connected")
+            while True:
+                line = self.fp.readline()
+                if not line:
+                    break
+                yield json.loads(line.decode("utf-8"))
+
+        return generator()
+
+    async def send_message(self, message: dict[str, Any]):
+        print("Sending message", message)
+
+    def close(self):
+        if not self.fp:
+            return
+        self.fp.close()
+
+
+async def get_python_files_from_dir(dir: Path) -> list[Path]:
+    """Get all Python files under a directory, returning relative paths."""
+    python_files: list[Path] = []
+
+    file_tree = await asyncio.to_thread(os.walk, dir)
+    for root, _, files in file_tree:
+        for file in files:
+            if file.endswith(".py"):
+                full_path = Path(root) / file
+                relative_path = full_path.relative_to(dir)
+                python_files.append(relative_path)
+    return python_files

intuned_internal_cli/commands/project/type_check.py

@@ -2,15 +2,15 @@ import json
 import os
 import subprocess
 import sys
+from typing import Any
 
-import arguably
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
-PYRIGHT_CONFIG_PATH = os.path.join(current_dir, "..", "..", "pyright_type_check.json")
-PYRIGHT_CONFIG_PATH = os.path.abspath(PYRIGHT_CONFIG_PATH)
+PYRIGHT_CONFIG_PATH = os.path.abspath(os.path.join(current_dir, "..", "..", "pyright_type_check.json"))
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__type_check():
     """
     Run type checking on the API directory using pyright.
@@ -39,7 +39,7 @@ async def project__type_check():
     print("📦 Checking Types...")
 
     try:
-        pyright_issues = []
+        pyright_issues: list[dict[str, Any]] = []
         pyright_result = subprocess.run(
             ["pyright", "--outputjson", project_dir, "--project", PYRIGHT_CONFIG_PATH],
             capture_output=True,

intuned_internal_cli/commands/root.py

@@ -1,7 +1,8 @@
 import arguably
 
 
-@arguably.command  # type: ignore
+# @arguably.command  # type: ignore
+# @run_sync
 async def __root__():
     """Internal Intuned CLI.
 

intuned_internal_cli/utils/wrapper.py

@@ -0,0 +1,15 @@
+from collections.abc import Awaitable
+from collections.abc import Callable
+from typing import ParamSpec
+from typing import TypeVar
+
+import arguably
+
+from runtime.utils.anyio import run_sync
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def internal_cli_command(fn: Callable[P, R | Awaitable[R]]) -> Callable[P, R]:
+    return arguably.command(run_sync(fn))  # type: ignore

{intuned_runtime-1.3.2.dist-info → intuned_runtime-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intuned-runtime
-Version: 1.3.2
+Version: 1.3.4
 Summary: Runtime SDK that powers browser automation projects running on Intuned
 License: Elastic-2.0
 License-File: LICENSE

{intuned_runtime-1.3.2.dist-info → intuned_runtime-1.3.4.dist-info}/RECORD

@@ -1,29 +1,29 @@
 intuned_cli/__init__.py,sha256=00r4AkrKFEzybNb4LWRZGSi3evyX9adVC6LoFItP5Ls,1208
-intuned_cli/commands/__init__.py,sha256=AiCFfIDmlliLvz-eebZ-oh-PgCMF3jA8dH4n9t4BgUE,1779
-intuned_cli/commands/attempt_api_command.py,sha256=oBPxiqsc8_J5YSXpuG4bj_HBzHhHehGiP2P-J9ZSvMA,2401
-intuned_cli/commands/attempt_authsession_check_command.py,sha256=L4oB7wl6ntAH2PMzWNNMqso6Zit7ts2HjXzqmdC8vzI,1781
-intuned_cli/commands/attempt_authsession_command.py,sha256=Qo9sj2mE27ha_XSGCfHhfqLybQzOaP0TjABagBkJkzs,282
-intuned_cli/commands/attempt_authsession_create_command.py,sha256=QT1-apHhDaxI3FMNUWApctpN6K694SsOkAwqS9vPRVg,2170
-intuned_cli/commands/attempt_command.py,sha256=HEic_NyrDFoTENtiF3UpJpxoxXHNXTd5yMCJjMNPyaI,258
-intuned_cli/commands/authsession_command.py,sha256=coHm9k23_aucxYnW08uSdMe0e_WXRwthbdQBXEUkmic,254
-intuned_cli/commands/authsession_record_command.py,sha256=B__J9T8qFQ-YFTuQPijdA41iq6-eZC-JpTQGoCuZLu0,2423
-intuned_cli/commands/command.py,sha256=cZLdhtdLXakhZ8Qbv6joqpD4AGgf30FYl9dc1KR3x6M,815
-intuned_cli/commands/deploy_command.py,sha256=D_CkGH0e1-vNEFd0y-0KFiquxviTYIAs_3Ba6DNj_Vo,1612
-intuned_cli/commands/init_command.py,sha256=XDf2ilNzqT43u0nn3GoM_L4VU9lfyxKpx2eTXtig_jI,555
-intuned_cli/commands/run_api_command.py,sha256=vcd4xLh0tEfBnk_qE5rg2LY8T2szASLMNzU7HsUI1BE,3451
-intuned_cli/commands/run_authsession_command.py,sha256=e_u4WWSDVZKCbK4wcuqqhWTdNrsjcLXaeUx8sIYjhkQ,274
-intuned_cli/commands/run_authsession_create_command.py,sha256=5VXDQRnShZhF89drZi6f3Ynb6i-b127IByDMf3mmIoU,3449
-intuned_cli/commands/run_authsession_update_command.py,sha256=1MBJ5-Z6TeLXgGX5pnVo2AYzRjTs7hFNADdzb0fuXPc,3501
-intuned_cli/commands/run_authsession_validate_command.py,sha256=zoLoyEMVUFsORDB9pf0HnvcMrnGZVgoO3OT75UQCae4,3355
-intuned_cli/commands/run_command.py,sha256=Q4-r_IIvGjuXoo-OSOq23aGDiJVoyfhtIMsp7XI11jU,250
-intuned_cli/commands/save_command.py,sha256=xm4132hSxAKdA7IGKUSpaDw3A7Dn9Lim5eBb-Vz69I0,1606
+intuned_cli/commands/__init__.py,sha256=Z-a4JJmc67fqHW9bVML15MO1X8YPeHn-SIC_YBSsAP0,1781
+intuned_cli/commands/attempt_api_command.py,sha256=bs_Sgyo1AxX-y3q-hWXD8lhXxdaAW8mPF8s0GfUK2oQ,2351
+intuned_cli/commands/attempt_authsession_check_command.py,sha256=SZ_PvTi_Tsiyz_UPHhsPelH2oiAdwvIA90YNIotLZfw,1731
+intuned_cli/commands/attempt_authsession_command.py,sha256=SqzeaTRz6d2Z2uantxnNaxlr9fAJNlSDTzkfKuAgzMQ,231
+intuned_cli/commands/attempt_authsession_create_command.py,sha256=U8xBdkfkMzma_KKR7-m9p2klqg-BJul1RVei88h82Xo,2120
+intuned_cli/commands/attempt_command.py,sha256=yLL9qxaPQJ9PjzNg95NUkghtf7Z6-EHujhcU8jyJY3I,207
+intuned_cli/commands/authsession_command.py,sha256=0XMkiKfNIzwudVw99S5JhiJOYKiQ6CcQRpSHWGpj2GM,203
+intuned_cli/commands/authsession_record_command.py,sha256=UR_sVTl6AgkTgXedasLa3RrQU189OfuwkA7dK-E1d8k,2373
+intuned_cli/commands/command.py,sha256=IYvFDCxA-ioLrZNQVh7t-7Zi_9bNELQs-J2m9onyNFY,764
+intuned_cli/commands/deploy_command.py,sha256=IJLxvmXuR0R0aBiYDRCZUK1XTWM0U0rIYRqfaetvX9k,1561
+intuned_cli/commands/init_command.py,sha256=HHjwC20LshW1frbUncC4bH3GPh5cL6nzLQq7LThs9LY,504
+intuned_cli/commands/run_api_command.py,sha256=CbXALVcsqI4HP-gcjR--6szrQdqhfw7Dc43QPLPjL00,3401
+intuned_cli/commands/run_authsession_command.py,sha256=5-1a3q_0PuzAoEUEmnr9HBf5HTqkaUzzrssJG4vIa9g,223
+intuned_cli/commands/run_authsession_create_command.py,sha256=YyzNJquHc9wsng1Pa7csmjmilRdgMP57gi_yjAPcQ4c,3158
+intuned_cli/commands/run_authsession_update_command.py,sha256=GpRu3MvTOp-U5nl9oCYNuLvk9G3KvPORIBSfBHtVAFc,3211
+intuned_cli/commands/run_authsession_validate_command.py,sha256=6bUl2FRR19b7_jAKuAENuO-ih_ygbBU_hg7fyM3Dgc8,3064
+intuned_cli/commands/run_command.py,sha256=-ayHF-noiDsnIobbszAz4JEpIEZh-lf8fAWK0CoxiIU,199
+intuned_cli/commands/save_command.py,sha256=H1X3SrRTBHCWiVr7PG94n-MIbW_bPtQWJaWrVvTk-5Y,1555
 intuned_cli/controller/__test__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intuned_cli/controller/__test__/test_api.py,sha256=CgPUTsdQZ6r4it8yU1JG96TiN1WKyeUMh__7UICg36k,24489
 intuned_cli/controller/__test__/test_authsession.py,sha256=fvkqm1B39kAxgb1iLXs4WlcVNzn3P6hvlvNS4IrdBgQ,52491
 intuned_cli/controller/api.py,sha256=GDBSn7J0567ziBLNEk6tiguUDLwUTvDU6kmMqifYKMQ,7511
 intuned_cli/controller/authsession.py,sha256=rx5qRaKp4ED3OArD8_qCDGjKqgy1Pc5s9YYfm6bxe-I,18688
-intuned_cli/controller/deploy.py,sha256=CFQ3MBEEsJ39JzINiOBgcxGGGQnuARz2TiRL1wsDRKo,5490
-intuned_cli/controller/save.py,sha256=xdo8d_bZ_CBTm0nleZXoyTSbl6Xee_acQgstoSYlArI,9526
+intuned_cli/controller/deploy.py,sha256=nmXIWTunPMqx_fcuFhbstWVQiIhCnI3bkJ4oMVBZQH8,5436
+intuned_cli/controller/save.py,sha256=LxIu6IznmTvAC5OpEQcnq1TnxYG6aCNBBdvmyVYs_Zg,8850
 intuned_cli/types.py,sha256=1BKCukVvn2i37-onpZ9rFLrcVh4kWW_ui0DzOIKugtI,704
 intuned_cli/utils/__test__/test_browser.py,sha256=NCv7OplirDxAjBpnfZharOa5O0fVNWA9xU3I1GVWB5M,4474
 intuned_cli/utils/__test__/test_traces.py,sha256=4EfzwizBt7VT9-dANMdBYFKQTPzPWMDnodSVyT5F4dY,901
@@ -40,33 +40,28 @@ intuned_cli/utils/help.py,sha256=NKTQCzaIINQsGHljJH68HemAVThbkKU3IQfxyRyVaD0,223
 intuned_cli/utils/import_function.py,sha256=UmE2yw5std1ENMFdBU-TUBuQ01qsv7Qr5ElnAhqE6Yc,453
 intuned_cli/utils/timeout.py,sha256=DkoeoU9XvKKKSQ06CpwqcNvxWqLPAOVuAMw6kSr4Tuo,886
 intuned_cli/utils/traces.py,sha256=Du_FnvSq-StLsAIQKSNyNSwkoMS-J93Tb6Ln4QgXVTE,793
-intuned_cli/utils/wrapper.py,sha256=A_WgbzHYSZYNCoubjR7HNJUfv5--B2QfVW0XOCiO5r0,2045
+intuned_cli/utils/wrapper.py,sha256=MRLtDhZLxQlOd0C44JrGV_WZJ3xbtZFaSsBTZGtd-oY,2269
 intuned_internal_cli/__init__.py,sha256=bcL7-SPWCE0SmszoBoEvcyf-wAGRHAzIRe7vlCq3NPA,1760
-intuned_internal_cli/commands/__init__.py,sha256=gZ-r8UIXvRakeCfvmOZCNWr8CJHBcYzRzbMjyKYPXV0,1003
-intuned_internal_cli/commands/ai_source/__init__.py,sha256=lg7owgcK8owNn2a4VBUP9RKxzFsLruhtnnQV0F_z6pc,149
-intuned_internal_cli/commands/ai_source/ai_source.py,sha256=2woQtCmhxKvLfEz832eUoCT9gMsuSvEE6rMnHSYXC7w,138
-intuned_internal_cli/commands/ai_source/deploy.py,sha256=NpomuP_2mo5SLKe7BZoY5H0Pp36aDtkYU_CyihqOvdI,2457
-intuned_internal_cli/commands/browser/__init__.py,sha256=AuVbvh7aSBTFKYvewXZyPoIvfBTe2uHiPcnaAkzapas,95
-intuned_internal_cli/commands/browser/save_state.py,sha256=_gfspwLkk6j1zBzqY1Qr7KnEMjGP6x10Q2IvKdfjyuI,839
-intuned_internal_cli/commands/init.py,sha256=8rWBenWZfwNtLxOBqhEMbOATyQNEnmDUmrFJ1xBGyxI,4384
-intuned_internal_cli/commands/project/__init__.py,sha256=t97wvhSenerYRdbSeCKXqHASA6EWA3lc1hnRhF9baOE,734
-intuned_internal_cli/commands/project/auth_session/__init__.py,sha256=gt7mlaW6xmqAc_4-pfF_FiecsR51C6fqCaq_NFbcbwA,300
-intuned_internal_cli/commands/project/auth_session/check.py,sha256=UDG2iF6ULmYH6_WdUTVRTAZq3fBHuVSzhWB1tGkkGb0,4524
-intuned_internal_cli/commands/project/auth_session/create.py,sha256=r-eYu3uLUo2mzF836CbVgu4oBzcIIDekzzFwwekxmg0,3374
-intuned_internal_cli/commands/project/auth_session/load.py,sha256=Y0V6bFZQeHq_lTtR-rQvM9SSbExWhVVMFu-Uykl-9k4,1199
-intuned_internal_cli/commands/project/project.py,sha256=_MSh6Xor2Cbh-ItifwgOPq_BP8UDuKB7S6w796FULKQ,137
-intuned_internal_cli/commands/project/run.py,sha256=7lqrFrTOaW0W5UF6WTVwwDauAoGbABNv6RVQ6_DEIfQ,12209
-intuned_internal_cli/commands/project/run_interface.py,sha256=4RyR8WZriIF7Va4z1wt-q6zZDQOI31n62Ho2dyimzUY,8717
-intuned_internal_cli/commands/project/type_check.py,sha256=QFnXL93Y-z250EQRln5sRqwkVqjGJ-eP_p1jGrXB7NA,3522
-intuned_internal_cli/commands/project/upgrade.py,sha256=XmkZLflM4O-mwvhwcswlZpazRotwi3xesLgE0Zz8fTI,3061
-intuned_internal_cli/commands/publish_packages.py,sha256=sijkaG7_s0I1EWgLekGy1qm8Aqi_gYY8poXbMX0B6Yw,10505
-intuned_internal_cli/commands/root.py,sha256=o75rSb5WYa5JMD8HLN3eiNu4fM0mar3y15A63-Qm4s4,426
+intuned_internal_cli/commands/__init__.py,sha256=WUC40iBg5ONoVFjhpLXMrNwgVVbmooUCT0Bm9tl8GAg,589
+intuned_internal_cli/commands/browser/__init__.py,sha256=lFuoW-OysNTN8Toe4sy1rEZmnnfQSKPKtoFRFEmBMKc,79
+intuned_internal_cli/commands/browser/save_state.py,sha256=sKVQ5558IYLNlNVokMvVrJcy7zlL5YZ9HvM9D6K4yZ4,878
+intuned_internal_cli/commands/project/__init__.py,sha256=KJANCr-wxgCd0Fu4NQC0IYzApdU5hl3dVYIDekGhiKg,544
+intuned_internal_cli/commands/project/auth_session/__init__.py,sha256=pjBR6l3NOhSByXG2xM6FpdveWzPj0Lg8-rfJ28VD2KM,252
+intuned_internal_cli/commands/project/auth_session/check.py,sha256=TbEwndBRn04dc2dZsLLqO6hBXbCYfa6V9Hxn9Ia8MBo,4564
+intuned_internal_cli/commands/project/auth_session/create.py,sha256=MG0JVJvEm0pFiQbMogqveOv1bs4STZKGhVt_rmHNB4Q,3413
+intuned_internal_cli/commands/project/auth_session/load.py,sha256=lnW0CDODe9Bvo05zuTZQVqYUbANDNMYhyQBIkI2g_aQ,1238
+intuned_internal_cli/commands/project/project.py,sha256=69XKffH5K4Y2xhWhUdSmYG9CR9E_qp_-3RZXG-v7fdE,177
+intuned_internal_cli/commands/project/run.py,sha256=rJHY9lTKnk2tr7rWjLaCFdeHniM3YsDRF7n1fk4TOf8,12249
+intuned_internal_cli/commands/project/run_interface.py,sha256=sMm74YpqufBThxOxT9RDd2zJjFfkuR6UXG7rDcR3_ZE,11011
+intuned_internal_cli/commands/project/type_check.py,sha256=VYqbtnvD9UpiyP8qCW5fLx52PKIj66Rw_ZD7Xe9HWtw,3565
+intuned_internal_cli/commands/root.py,sha256=HLW2JWAt_5y9rGB8iaciAY4w94krF2v1AwxS_n4y1h0,440
 intuned_internal_cli/logger.py,sha256=bZK3q-KUdGxk_qzDb6pn-n0LOhKJvi6a9p8oSwZtq3s,594
 intuned_internal_cli/utils/ai_source_project.py,sha256=xUCM6p3i1XN4bJbuQz8LCzeI4BwqAdSvCl_vwDAEi0k,831
 intuned_internal_cli/utils/code_tree.py,sha256=1wfxZoQ5kRCfqs2SEPAicbAIPTiD6P1LxSuwYu_eeaI,2790
 intuned_internal_cli/utils/run_apis.py,sha256=Zee4zkgt9R8XY1XCGzj2Nc4zJ3jlRz1xnO493wotuWw,4690
 intuned_internal_cli/utils/setup_ide_functions_token.py,sha256=72-hf5HOPO9hj_eo3MTSVEPIwtkaIma_NRepsw_FHQM,304
 intuned_internal_cli/utils/unix_socket.py,sha256=UISmkJMHrir5iBLUm6vxC3uzTGIFyOk_wa0C9LUw4Cc,1889
+intuned_internal_cli/utils/wrapper.py,sha256=Y0yAs2XrDHChUMUsEYcRT0AbSkZCfdgAvZs0Sdrbirg,366
 intuned_runtime/__init__.py,sha256=1BPzEc-qC2WAYiCWDOJChpgnFyO3ZNYRKHEZqdHUGwM,322
 runtime/__init__.py,sha256=87gDXuxUv_kGzQfuB1mh6DF-dDysJN8r684c7jGnHxc,144
 runtime/backend_functions/__init__.py,sha256=j2EaK4FK8bmdFtqc5FxtFwx1KhIn_7qKPChrrAhJI3s,119
@@ -77,9 +72,9 @@ runtime/browser/extensions/__init__.py,sha256=VGUFvkYUwuYc9UlYy1TD79veXuDhnLDcmb
 runtime/browser/extensions/helpers.py,sha256=W3XiOf66J_xWpa4-U7hQjW0CfAucCYz12pBcIRnzLTQ,387
 runtime/browser/extensions/intuned_extension.py,sha256=_La0ikQX2isdiBgZXkZt2iQ6eyW7Fe-9yjePFzpj0rk,2804
 runtime/browser/helpers.py,sha256=CwgiBToawPgwAY9nIGkGHW544N7Db_OgKmS-SHkN2pU,1255
-runtime/browser/launch_browser.py,sha256=ym97J4RffOGUwhi9iNjAR5Ek2f8pKiAtAcDQFSqMJw0,1899
+runtime/browser/launch_browser.py,sha256=MFo9Nb9eQgGO3w3ngRp9epzolcTBvekDQudZwIE6_74,2516
 runtime/browser/launch_camoufox.py,sha256=TBOAwwipNGlbtMdFYnGkVM0ppLU44vWNkMGZA5uPZCE,1787
-runtime/browser/launch_chromium.py,sha256=CetUfwod8JFrpsbePwQqyifw8ofx3jDXR6u9KMxJzJo,8305
+runtime/browser/launch_chromium.py,sha256=p3mpUwVGTOeKBjiaNJMlkW0a5ipQU-sFO2H2J0cTaW0,8832
 runtime/browser/storage_state.py,sha256=fwLg8sP-H-vgt_6AJKNl03CpgyMVCQWWcN2cqswTQMs,3603
 runtime/constants.py,sha256=YMYQgCWZdJXUpxz_IN2TvZO5rFye9k_Lk9CS8m-shLg,34
 runtime/context/__init__.py,sha256=hg8ejm4bJy4tNkwmZ9lKgYJx6bU7OgOdBS684Uv5XGg,73
@@ -103,17 +98,18 @@ runtime/run/pydantic_encoder.py,sha256=wJCljwwINSICvCJ0i2izp2RLkQ15nYglUQCyyjM40
 runtime/run/run_api.py,sha256=AFhZerLTyHGznGCJl0fLbiTqhZ_WRmphaJK-RqrupTQ,8981
 runtime/run/setup_context_hook.py,sha256=KTX4mRmeUEmYS9zrmobR1V09GakOk6uz81Uo_xXTJZk,1156
 runtime/run/traces.py,sha256=fKzh11LqV47ujgq_9I2tdp-dgld566wffWaHwU_4gis,1123
-runtime/run/types.py,sha256=RR4RGiYVBIK6f2qXvzfLhQMZ8kmrziu265k5eqoIh98,346
+runtime/run/types.py,sha256=-7ACaxa5vg2qHw14JunvUWt-AchanTQU4FRF57DxJWo,287
 runtime/types/__init__.py,sha256=LWf5iOMgbve_BrpVP-LWWzDD3v2K4Y2sLxthOnVEqyY,539
 runtime/types/payload.py,sha256=sty8HgDEn3nJbZrwEOMCXyuG7_ICGDwlBIIWSON5ABY,124
 runtime/types/run_types.py,sha256=GcYLkL2BHxOjT4O3KvBP6xjBKsmJbjltMt_5bCVnfCI,4554
-runtime/types/settings_types.py,sha256=lgu3O-LXSa1Gbv1j6Uzd5udpSFBl2KR9T4vRVWITVfk,2832
+runtime/types/settings_types.py,sha256=pVVh67lv7iHAUUbovGHvbswEFtx_N-b7jTwFvk968Hg,3118
 runtime/utils/__init__.py,sha256=v0qHjnc54YCkY1yPbXuihgymVZau_15xaEVyaFQj9ts,78
+runtime/utils/anyio.py,sha256=KNemAQmmS425YKbVH_7DAE5lcDG_UziJHHTt9YJKS4o,697
 runtime/utils/config_loader.py,sha256=yqk2eDGbgyw0Xslgd3dJbB28NjUe02L9LyCxzCmH9r4,482
 runtime_helpers/__init__.py,sha256=1BPzEc-qC2WAYiCWDOJChpgnFyO3ZNYRKHEZqdHUGwM,322
 runtime_helpers/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-intuned_runtime-1.3.2.dist-info/METADATA,sha256=octnZbDG6RfYfHhnElBIZxL_v4b1ZaASmPgETnPHDyo,5473
-intuned_runtime-1.3.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-intuned_runtime-1.3.2.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
-intuned_runtime-1.3.2.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
-intuned_runtime-1.3.2.dist-info/RECORD,,
+intuned_runtime-1.3.4.dist-info/METADATA,sha256=evPlfZys9C-YXh_s5UsQnqCSBtB4MX0szxNm_hkIcx4,5473
+intuned_runtime-1.3.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+intuned_runtime-1.3.4.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
+intuned_runtime-1.3.4.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
+intuned_runtime-1.3.4.dist-info/RECORD,,

runtime/browser/launch_browser.py

@@ -1,3 +1,5 @@
+import asyncio
+import shutil
 from contextlib import asynccontextmanager
 from contextlib import AsyncExitStack
 from typing import AsyncContextManager
@@ -49,6 +51,19 @@ async def launch_browser(
                 if cdp_port:
                     raise AutomationError(ValueError("CDP port is not supported with Camoufox"))
                 context, page = await stack.enter_async_context(launch_camoufox(headless=headless, proxy=proxy))
+            case "brave":
+                brave_path = await asyncio.to_thread(shutil.which, "brave-browser-stable")
+                if brave_path is None:
+                    raise RuntimeError("Brave browser not found")
+                context, page = await stack.enter_async_context(
+                    launch_chromium(
+                        headless=headless,
+                        cdp_address=cdp_address,
+                        cdp_port=cdp_port,
+                        proxy=proxy,
+                        executable_path=brave_path,
+                    )
+                )
             case "chromium" | _:
                 context, page = await stack.enter_async_context(
                     launch_chromium(headless=headless, cdp_address=cdp_address, cdp_port=cdp_port, proxy=proxy)

runtime/browser/launch_chromium.py

@@ -20,6 +20,7 @@ from .helpers import wait_on_cdp_address
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
+    from playwright.async_api import Page
     from playwright.async_api import ProxySettings
     from playwright.async_api import ViewportSize
 
@@ -57,6 +58,7 @@ async def launch_chromium(
     proxy: "ProxySettings | None" = None,
     viewport: "ViewportSize | None" = None,
     app_mode_initial_url: str | None = None,
+    executable_path: os.PathLike[str] | str | None = None,
     **kwargs: Any,
 ):
     from playwright.async_api import async_playwright
@@ -101,8 +103,15 @@ async def launch_chromium(
             if headless:
                 args_to_ignore.append("--headless=old")
                 extra_args.append("--headless=new")
+
+            if executable_path is not None:
+                executable_path = await anyio.Path(executable_path).resolve()
+                if not await executable_path.exists():
+                    logger.warning(f"Executable path {executable_path} does not exist. Falling back to default.")
+                    executable_path = None
             context = await playwright.chromium.launch_persistent_context(
                 os.fspath(user_preferences_dir),
+                executable_path=str(executable_path) if executable_path else None,
                 headless=headless,
                 viewport=viewport,
                 proxy=proxy,
@@ -171,7 +180,7 @@ async def dangerous_launch_chromium(
         for page in context.pages:
             await page.set_viewport_size(kwargs.get("viewport", {"width": 1280, "height": 800}))
 
-        async def set_viewport_size(page):
+        async def set_viewport_size(page: "Page"):
             # check if the page is already closed
             if page.is_closed():
                 return

runtime/run/types.py

@@ -4,11 +4,6 @@ from typing import Awaitable
 from typing import Optional
 from typing import Protocol
 
-from git import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    pass
-
 
 class ImportFunction(Protocol):
     def __call__(self, file_path: str, name: Optional[str] = None, /) -> Callable[..., Awaitable[Any]]: ...

runtime/types/settings_types.py

@@ -9,11 +9,21 @@ class CaptchaSettings(BaseModel):
     enabled: bool = Field(default=False)
 
 
-class CustomCaptchaSettings(CaptchaSettings):
+class CaptchaSolverSolveSettings(BaseModel):
     model_config = {
         "populate_by_name": True,
         "serialize_by_alias": True,
     }
+    auto_solve: bool = Field(default=True, alias="autoSolve")
+    solve_delay: int = Field(default=2000, alias="solveDelay")
+    max_retries: int = Field(default=3, alias="maxRetries")
+    timeout: int = Field(default=30000)
+
+
+class CustomCaptchaSettings(CaptchaSettings):
+    model_config = {
+        "serialize_by_alias": True,
+    }
 
     image_locators: List[str] = Field(alias="imageLocators", default=[])
     submit_locators: List[str] = Field(alias="submitLocators", default=[])
@@ -47,9 +57,7 @@ class CaptchaSolverSettings(BaseModel):
     lemin: CaptchaSettings = Field(default_factory=CaptchaSettings)
     custom_captcha: CustomCaptchaSettings = Field(alias="customCaptcha", default_factory=CustomCaptchaSettings)
     text: TextCaptchaSettings = Field(default_factory=TextCaptchaSettings)
-    settings: dict[str, int | bool] = Field(
-        default={"autoSolve": True, "solveDelay": 2000, "maxRetries": 3, "timeout": 30000}
-    )
+    settings: CaptchaSolverSolveSettings = Field(default_factory=CaptchaSolverSolveSettings)
 
 
 class IntunedJsonDisabledAuthSessions(BaseModel):

runtime/utils/anyio.py

@@ -0,0 +1,26 @@
+import functools
+import inspect
+from functools import wraps
+from typing import Any
+from typing import Callable
+from typing import TypeVar
+
+import anyio
+
+T = TypeVar("T")
+
+
+def run_sync(func: Callable[..., T]) -> Callable[..., T]:
+    """
+    Wrapper that runs a function synchronously.
+    If the function is async, it will be run using anyio.run instead of asyncio.run.
+    """
+
+    @wraps(func)
+    def wrapper(*args: Any, **kwargs: Any) -> T:
+        if inspect.iscoroutinefunction(func):
+            func_with_args_kwargs = functools.partial(func, *args, **kwargs)
+            return anyio.run(func_with_args_kwargs, backend="asyncio")
+        return func(*args, **kwargs)
+
+    return wrapper

intuned_internal_cli/commands/ai_source/__init__.py

@@ -1,4 +0,0 @@
-from .ai_source import ai_source  # type: ignore
-from .deploy import ai_source__deploy  # type: ignore
-
-__all__ = ["ai_source", "ai_source__deploy"]

intuned_internal_cli/commands/ai_source/ai_source.py

@@ -1,10 +0,0 @@
-import arguably
-
-
-@arguably.command  # type: ignore
-def ai_source():
-    """
-    Commands to run on AI source projects.
-    """
-
-    pass

intuned_internal_cli/commands/ai_source/deploy.py

@@ -1,64 +0,0 @@
-import json
-
-import arguably
-from more_termcolor import bold  # type: ignore
-from more_termcolor import cyan  # type: ignore
-from more_termcolor import green  # type: ignore
-from more_termcolor import red  # type: ignore
-
-from intuned_internal_cli.utils.code_tree import convert_project_to_code_tree
-
-from ...utils.ai_source_project import AiSourceInfo
-from ...utils.ai_source_project import deploy_ai_source
-
-
-@arguably.command  # type: ignore
-def ai_source__deploy(
-    *,
-    ai_source_info_str: str,
-    ai_source_info_path: str,
-    yes_to_all: bool = False,
-):
-    """
-    Commands to run on AI source projects.
-
-    Args:
-        ai_source_info_str (str): [--ai-source-info] JSON string containing the AI source project information.
-        ai_source_info_path (str): Path to the JSON file containing the AI source project information. Defaults to <current directory>/ai_source.json.
-        yes_to_all (bool): [-y/--yes] Skip confirmation prompts.
-    """
-
-    if ai_source_info_str and ai_source_info_path:
-        raise ValueError("Only one of ai_source_info or ai_source_info_path should be provided.")
-
-    if not (ai_source_info_str or ai_source_info_path):
-        ai_source_info_path = "ai_source.json"
-
-    try:
-        if ai_source_info_str:
-            ai_source_info_json = json.loads(ai_source_info_str)
-        else:
-            with open(ai_source_info_path) as f:
-                ai_source_info_json = json.load(f)
-        ai_source_info = AiSourceInfo(**ai_source_info_json)
-    except json.JSONDecodeError as e:
-        raise ValueError(f"Invalid JSON in ai_source_info: {e}") from e
-    except FileNotFoundError as e:
-        raise ValueError("AI source info file not found") from e
-    except OSError as e:
-        raise ValueError("Error reading AI source info file") from e
-    except TypeError as e:
-        raise ValueError("AI source info is invalid:", str(e)) from e
-
-    wait_for_confirm = not yes_to_all
-
-    code_tree = convert_project_to_code_tree(".", wait_for_confirm=wait_for_confirm)
-
-    success = deploy_ai_source(code_tree, ai_source_info)
-
-    if success:
-        print(
-            f"🚀 AI source deployment triggered for {bold(green(ai_source_info.id))} ({bold(green(ai_source_info.version_id))}). Check progress at {cyan(f"{ai_source_info.environment_url}/__internal-ai-sources/{ai_source_info.id}?version_id={ai_source_info.version_id}")}"
-        )
-    else:
-        print(red(bold("Deployment failed")))