intuned-runtime 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

intuned_cli/utils/traces.py

@@ -0,0 +1,31 @@
+from contextlib import contextmanager
+from datetime import datetime
+from pathlib import Path
+
+from intuned_cli.utils.console import console
+from runtime.types.run_types import TracingDisabled
+from runtime.types.run_types import TracingEnabled
+
+_trace_dir_name = datetime.now().isoformat()
+
+_count = 0
+
+
+def get_trace_path(id: str):
+    global _count
+    _count += 1
+    return Path() / "traces" / _trace_dir_name / f"{_count}-{id}.zip"
+
+
+@contextmanager
+def cli_trace(id: str | None):
+    if not id:
+        yield TracingDisabled()
+        return
+
+    trace_path = get_trace_path(id)
+    try:
+        yield TracingEnabled(file_path=str(trace_path))
+    finally:
+        if trace_path.exists():
+            console.print(f"[bold]Trace saved to [/bold][underline]{str(trace_path)}[/underline]")

intuned_cli/utils/wrapper.py

@@ -0,0 +1,68 @@
+import asyncio
+from collections.abc import Awaitable
+from collections.abc import Callable
+from functools import wraps
+from typing import Any
+from typing import cast
+from typing import ParamSpec
+from typing import TypeVar
+
+import arguably
+
+from intuned_cli.utils.browser import close_cli_browser
+from intuned_cli.utils.browser import is_cli_browser_launched
+from intuned_cli.utils.console import console
+from intuned_cli.utils.error import CLIError
+from intuned_cli.utils.error import CLIExit
+from intuned_cli.utils.error import log_automation_error
+from runtime.errors.run_api_errors import RunApiError
+from runtime.utils.anyio import run_sync
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def cli_command(fn: Callable[P, Awaitable[R]]) -> Callable[P, R]:
+    @arguably.command  # type: ignore
+    @wraps(fn)
+    @run_sync
+    async def wrapper(*args: Any, **kwargs: Any) -> R:
+        keep_open = kwargs.get("keep_browser_open", False)
+        if keep_open:
+            console.print(
+                "[bold]--keep-browser-open is set, the CLI will not close the last browser after the command completes.[/bold]"
+            )
+        try:
+            result = await fn(*args, **kwargs)
+            return result
+        except CLIError as e:
+            if e.auto_color:
+                console.print(f"[bold red]{e.message}[/bold red]")
+            else:
+                console.print(e.message)
+            raise CLIExit(1) from e
+        except RunApiError as e:
+            log_automation_error(e)
+            raise CLIExit(1) from e
+        except KeyboardInterrupt:
+            console.print("[bold red]Aborted[/bold red]")
+            raise CLIExit(1) from None
+        except Exception as e:
+            console.print(
+                f"[red][bold]An error occurred: [/bold]{e}\n[bold]Please report this issue to the Intuned team.[/bold]"
+            )
+            raise CLIExit(1) from e
+        finally:
+            if keep_open:
+                await _wait_for_user_input()
+            await close_cli_browser()
+
+    return cast(Callable[P, R], wrapper)
+
+
+async def _wait_for_user_input():
+    if not is_cli_browser_launched():
+        return
+    if not console.is_terminal:
+        return
+    await asyncio.to_thread(console.input, "Press Enter to continue...")

intuned_internal_cli/__init__.py

@@ -1,3 +1,4 @@
+import logging
 import sys
 import traceback
 
@@ -12,6 +13,12 @@ from runtime.context.context import IntunedContext
 
 from . import commands
 
+logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+
+logging.getLogger("runtime").setLevel(logging.INFO)
+logging.getLogger("intuned_runtime").setLevel(logging.INFO)
+logging.getLogger("intuned_browser").setLevel(logging.INFO)
+
 
 def run():
     dotenv = find_dotenv(usecwd=True)

intuned_internal_cli/commands/__init__.py

@@ -1,23 +1,15 @@
-from .ai_source import ai_source  # type: ignore
-from .ai_source import ai_source__deploy  # type: ignore
-from .browser import browser__save_state  # type: ignore
-from .init import init  # type: ignore
-from .project import project  # type: ignore
-from .project import project__run  # type: ignore
-from .project import project__type_check  # type: ignore
-from .project.auth_session import project__auth_session__check  # type: ignore
-from .project.auth_session import project__auth_session__create  # type: ignore
-from .project.auth_session import project__auth_session__load  # type: ignore
-from .publish_packages import publish_packages  # type: ignore
-from .root import __root__  # type: ignore
+from .browser import browser__save_state
+from .project import project
+from .project import project__run
+from .project import project__type_check
+from .project.auth_session import project__auth_session__check
+from .project.auth_session import project__auth_session__create
+from .project.auth_session import project__auth_session__load
+from .root import __root__
 
 __all__ = [
     "project__run",
-    "publish_packages",
-    "init",
     "project",
-    "ai_source__deploy",
-    "ai_source",
     "project__auth_session__load",
     "project__auth_session__create",
     "project__auth_session__check",

intuned_internal_cli/commands/browser/__init__.py

@@ -1,3 +1,3 @@
-from .save_state import browser__save_state  # type: ignore
+from .save_state import browser__save_state
 
 __all__ = ["browser__save_state"]

intuned_internal_cli/commands/browser/save_state.py

@@ -1,13 +1,12 @@
 import json
 import os
 
-import arguably
-
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.browser import launch_browser
 from runtime.browser.storage_state import get_storage_state
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def browser__save_state(
     *,
     cdp_address: str,

intuned_internal_cli/commands/project/__init__.py

@@ -1,11 +1,10 @@
-from .auth_session import project__auth_session__check  # type: ignore
-from .auth_session import project__auth_session__create  # type: ignore
-from .auth_session import project__auth_session__load  # type: ignore
-from .project import project  # type: ignore
-from .run import project__run  # type: ignore
-from .run_interface import project__run_interface  # type: ignore
-from .type_check import project__type_check  # type: ignore
-from .upgrade import project__upgrade  # type: ignore
+from .auth_session import project__auth_session__check
+from .auth_session import project__auth_session__create
+from .auth_session import project__auth_session__load
+from .project import project
+from .run import project__run
+from .run_interface import project__run_interface
+from .type_check import project__type_check
 
 __all__ = [
     "run",
@@ -15,6 +14,5 @@ __all__ = [
     "project__auth_session__load",
     "project__auth_session__create",
     "project__auth_session__check",
-    "project__upgrade",
     "project__run_interface",
 ]

intuned_internal_cli/commands/project/auth_session/__init__.py

@@ -1,5 +1,5 @@
-from .check import project__auth_session__check  # type: ignore
-from .create import project__auth_session__create  # type: ignore
-from .load import project__auth_session__load  # type: ignore
+from .check import project__auth_session__check
+from .create import project__auth_session__create
+from .load import project__auth_session__load
 
 __all__ = ["project__auth_session__check", "project__auth_session__create", "project__auth_session__load"]

intuned_internal_cli/commands/project/auth_session/check.py

@@ -2,7 +2,6 @@ import json
 import os
 from typing import Any
 
-import arguably
 import pydantic  # type: ignore
 from more_termcolor import bold  # type: ignore
 from more_termcolor import green  # type: ignore
@@ -12,6 +11,7 @@ from tenacity import retry_if_not_result
 from tenacity import RetryError
 from tenacity import stop_after_attempt
 
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.context.context import IntunedContext
 from runtime.errors.run_api_errors import RunApiError
 from runtime.run.intuned_settings import load_intuned_settings
@@ -27,7 +27,7 @@ from runtime.types.run_types import StorageState
 from runtime.types.run_types import TracingDisabled
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__auth_session__check(
     *,
     no_headless: bool = False,

intuned_internal_cli/commands/project/auth_session/create.py

@@ -2,8 +2,7 @@ import json
 import os
 from typing import Any
 
-import arguably
-
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.context.context import IntunedContext
 from runtime.errors.run_api_errors import RunApiError
 from runtime.run.intuned_settings import load_intuned_settings
@@ -16,7 +15,7 @@ from runtime.types.run_types import StandaloneRunOptions
 from runtime.types.run_types import TracingDisabled
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__auth_session__create(
     *,
     no_headless: bool = False,

intuned_internal_cli/commands/project/auth_session/load.py

@@ -1,15 +1,14 @@
 import json
 import os
 
-import arguably
-
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.browser import launch_browser
 from runtime.browser.storage_state import set_storage_state
 from runtime.run.intuned_settings import load_intuned_settings
 from runtime.types.run_types import StorageState
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__auth_session__load(
     *,
     cdp_address: str,

intuned_internal_cli/commands/project/project.py

@@ -1,7 +1,7 @@
-import arguably
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 def project():
     """
     Commands to run on automation projects.

intuned_internal_cli/commands/project/run.py

@@ -10,7 +10,6 @@ from importlib import import_module
 from typing import Any
 from typing import cast
 
-import arguably
 from dotenv import find_dotenv
 from dotenv import load_dotenv
 from more_termcolor import bold  # type: ignore
@@ -21,6 +20,7 @@ from more_termcolor import on_blue  # type: ignore
 from more_termcolor import underline  # type: ignore
 from more_termcolor import yellow  # type: ignore
 
+from intuned_internal_cli.utils.wrapper import internal_cli_command
 from runtime.run.intuned_settings import load_intuned_settings
 from runtime.types import Payload
 from runtime.types.run_types import Auth
@@ -38,7 +38,7 @@ class Mode(StrEnum):
     ide = "ide"
 
 
-@arguably.command  # type: ignore
+@internal_cli_command
 async def project__run(
     *,
     api_name: str = "default",

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.1.dist-info → intuned_runtime-1.3.3.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: intuned-runtime
-Version: 1.3.1
-Summary: Runtime commands for Intuned platform Python scrapers
+Version: 1.3.3
+Summary: Runtime SDK that powers browser automation projects running on Intuned
 License: Elastic-2.0
 License-File: LICENSE
 Keywords: runtime,intuned
@@ -23,12 +23,14 @@ Requires-Dist: browserforge[all]
 Requires-Dist: camoufox[geoip] (>=0.4.11,<0.5.0)
 Requires-Dist: gitpython (>=3.1.43,<4.0.0)
 Requires-Dist: httpx (>=0.23.0,<1)
+Requires-Dist: jsonc-parser (>=1.1.5,<2.0.0)
 Requires-Dist: more-termcolor (>=1.1.3,<2.0.0)
 Requires-Dist: pathspec (>=0.12.1,<0.13.0)
 Requires-Dist: pydantic (>=2.10.6,<3.0.0)
 Requires-Dist: pyright (>=1.1.387,<2.0.0)
 Requires-Dist: python-dotenv (==1.0.1)
 Requires-Dist: pytimeparse (>=1.1.8,<2.0.0)
+Requires-Dist: pyyaml (>=6.0.3,<7.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=14.1.0,<15.0.0)
 Requires-Dist: ruff (>=0.7.2,<0.8.0)