intuned-runtime 1.2.4__py3-none-any.whl → 1.3.0__py3-none-any.whl

intuned_cli/types.py

@@ -1,5 +1,4 @@
 from pydantic import BaseModel
-from pydantic import Field
 from pydantic import RootModel
 
 
@@ -20,14 +19,3 @@ class FileNode(BaseModel):
 
 
 FileSystemTree.model_rebuild()
-
-
-class IntunedJson(BaseModel):
-    model_config = {"populate_by_name": True}
-
-    class _AuthSessions(BaseModel):
-        enabled: bool
-
-    auth_sessions: _AuthSessions = Field(alias="authSessions")
-    project_name: str | None = Field(alias="projectName", default=None)
-    workspace_id: str | None = Field(alias="workspaceId", default=None)

intuned_cli/utils/api_helpers.py

@@ -3,8 +3,8 @@ from typing import overload
 
 from anyio import Path
 
-from intuned_cli.types import IntunedJson
 from intuned_cli.utils.error import CLIError
+from runtime.types import IntunedJson
 
 
 @overload

intuned_cli/utils/backend.py

@@ -1,7 +1,7 @@
 import os
 
-from intuned_cli.types import IntunedJson
 from intuned_cli.utils.error import CLIError
+from runtime.types import IntunedJson
 
 
 def get_base_url():

{intuned_runtime-1.2.4.dist-info → intuned_runtime-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intuned-runtime
-Version: 1.2.4
+Version: 1.3.0
 Summary: Runtime commands for Intuned platform Python scrapers
 License: Elastic-2.0
 License-File: LICENSE

{intuned_runtime-1.2.4.dist-info → intuned_runtime-1.3.0.dist-info}/RECORD

@@ -22,10 +22,10 @@ intuned_cli/controller/api.py,sha256=cIxfuKsMibn7XRbTQCELy1QVtWH-UMWO8KGyOCvKx2A
 intuned_cli/controller/authsession.py,sha256=KGpRYXO9W6DFbuM1ofdH5aba0Zs4A_A3nhbNj-KaCE8,14272
 intuned_cli/controller/deploy.py,sha256=krbVm0-c1XDIsiOPIf0lesFmFuVF_VfGYNWCOQ70Mmo,5452
 intuned_cli/controller/save.py,sha256=_ujsh4C9cgFGW4GTkj43JDSpIq0TuBLhZRJsH_1wgX8,9025
-intuned_cli/types.py,sha256=Lsykui4mbq5T1_1L7Gg5OZpJvCOmaz9EiQcZVfUEoLc,766
-intuned_cli/utils/api_helpers.py,sha256=57gvXVYM_9hMGIkMqSEN_jzs3mYWlXzinPjYXzzqgg8,1122
+intuned_cli/types.py,sha256=A053bHBqgVUG5wdHygwlJ2F-XeJIhFRidSOij5veBOQ,394
+intuned_cli/utils/api_helpers.py,sha256=q_xJMcl-RMccdTNTyDFu27T4OrXihhZtshYdZDiSDGI,1118
 intuned_cli/utils/auth_session_helpers.py,sha256=acKAPUjOfdybstLur4Lk3huaLFP2Ipl4AjPSqQPQLzY,1899
-intuned_cli/utils/backend.py,sha256=CtGoX6eWO6dUnND_FUurIgBXgp9Z4y89k8j3tYK9G-k,1030
+intuned_cli/utils/backend.py,sha256=RvaDClFDf_Tur1E4Z_HoxM1hsHYpm_CWG0ju77ZyKZo,1026
 intuned_cli/utils/confirmation.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intuned_cli/utils/console.py,sha256=jgin2xB-0kpANPMoiDBOnWhrc8Ey5zT4IHRxQa8f5CQ,93
 intuned_cli/utils/error.py,sha256=KzqWG0e8PLerCY-AL534zygCLbIBD6uReo2WEuej-EA,990
@@ -65,10 +65,13 @@ runtime/backend_functions/__init__.py,sha256=j2EaK4FK8bmdFtqc5FxtFwx1KhIn_7qKPCh
 runtime/backend_functions/_call_backend_function.py,sha256=NpbQmEieuRan0fgbJQ0L_skU6MgjMmR99bWsQQYuFtI,3402
 runtime/backend_functions/get_auth_session_parameters.py,sha256=pOvB7XiWpphEuBpazdKALw9EWgBU1PeY3gkzBfVLpkc,869
 runtime/browser/__init__.py,sha256=EPWfa4ZmdR8GJqh2qcsx1ZvHmCYiUYrQ-zeHYVapH9s,285
+runtime/browser/extensions/__init__.py,sha256=VGUFvkYUwuYc9UlYy1TD79veXuDhnLDcmbyHiVnf6dQ,80
+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_camoufox.py,sha256=TBOAwwipNGlbtMdFYnGkVM0ppLU44vWNkMGZA5uPZCE,1787
-runtime/browser/launch_chromium.py,sha256=XW2u1Ao6MfaMzqL5hnXhR8s8EzQ0TpjyHjSQXHpuAYM,6677
+runtime/browser/launch_chromium.py,sha256=uKX12nclua-tcW6_dgJvihq4MrcC0tnsgcndKSLWm_M,8002
 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
@@ -93,13 +96,16 @@ 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/types/__init__.py,sha256=IJkDfqsau8F8R_j8TO6j-JwW4ElQr6aU6LNaWRehg5U,401
+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=KWCxrQBlvJ8cmOJ2w1qd0-R5ypKlJLFJ5aiRh3BAluU,2486
+runtime/utils/__init__.py,sha256=v0qHjnc54YCkY1yPbXuihgymVZau_15xaEVyaFQj9ts,78
+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.2.4.dist-info/METADATA,sha256=dHCG5TB2mH07dwJNrxrhaclfvjJuH5juy7L2auOhdYY,5372
-intuned_runtime-1.2.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-intuned_runtime-1.2.4.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
-intuned_runtime-1.2.4.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
-intuned_runtime-1.2.4.dist-info/RECORD,,
+intuned_runtime-1.3.0.dist-info/METADATA,sha256=urXlJpaADhNBiM22PAO1OUOn0xhbXEh8HyDsJSVZO6w,5372
+intuned_runtime-1.3.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+intuned_runtime-1.3.0.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
+intuned_runtime-1.3.0.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
+intuned_runtime-1.3.0.dist-info/RECORD,,

runtime/browser/extensions/__init__.py

@@ -0,0 +1,3 @@
+from .helpers import build_extensions_list
+
+__all__ = ["build_extensions_list"]

runtime/browser/extensions/helpers.py

@@ -0,0 +1,11 @@
+from .intuned_extension import get_intuned_extension_path
+from .intuned_extension import is_intuned_extension_enabled
+
+
+def build_extensions_list() -> list[str]:
+    extensions_list: list[str] = []
+
+    if is_intuned_extension_enabled():
+        intuned_extension_path = get_intuned_extension_path()
+        extensions_list.append(str(intuned_extension_path))
+    return extensions_list

runtime/browser/extensions/intuned_extension.py

@@ -0,0 +1,87 @@
+import logging
+import os
+from pathlib import Path
+from typing import Any
+
+from playwright.async_api import BrowserContext
+
+from runtime.context.context import IntunedContext
+from runtime.env import get_functions_domain
+from runtime.env import get_project_id
+from runtime.env import get_workspace_id
+from runtime.types import CaptchaSolverSettings
+from runtime.utils.config_loader import load_intuned_json
+
+logger = logging.getLogger(__name__)
+
+
+def get_intuned_extension_path() -> Path | None:
+    if "INTUNED_EXTENSION_PATH" not in os.environ:
+        return None
+    intuned_extension_path = Path(os.environ["INTUNED_EXTENSION_PATH"])
+    if not intuned_extension_path.exists():
+        return None
+    return intuned_extension_path
+
+
+def is_intuned_extension_enabled() -> bool:
+    intuned_extension_path = get_intuned_extension_path()
+    if intuned_extension_path is None:
+        return False
+    else:
+        return True
+
+
+async def get_intuned_worker(context: BrowserContext):
+    if not is_intuned_extension_enabled():
+        return None
+
+    for attempt in range(5):
+        for service_worker in context.service_workers:
+            if "intunedWorker.js" in service_worker.url:
+                return service_worker
+        try:
+            if attempt < 4:
+                await context.wait_for_event("serviceworker", timeout=3000)
+        except Exception as e:
+            logger.warning(f"Error accessing service workers (attempt {attempt + 1}): {e}")
+
+    logger.warning("Failed to get intuned worker after 5 attempts")
+    return None
+
+
+async def get_intuned_extension_settings() -> dict[str, Any]:
+    intuned_json = await load_intuned_json()
+    captcha_settings: CaptchaSolverSettings = (
+        intuned_json.captcha_solver
+        if intuned_json and intuned_json.captcha_solver is not None
+        else CaptchaSolverSettings()
+    )
+    context = IntunedContext.current()
+    return {
+        **captcha_settings.model_dump(mode="json"),
+        "workspaceId": get_workspace_id(),
+        "projectId": get_project_id(),
+        "token": context.functions_token,
+        "baseUrl": get_functions_domain(),
+    }
+
+
+async def setup_intuned_extension():
+    if not is_intuned_extension_enabled():
+        return
+    intuned_extension_path = get_intuned_extension_path()
+    if intuned_extension_path is None:
+        logger.warning("Intuned extension path not found, intuned extension might not work properly")
+        return
+
+    settings_path = intuned_extension_path / "intunedSettings.json"
+    settings_data = await get_intuned_extension_settings()
+
+    try:
+        with open(settings_path, "w") as f:
+            import json
+
+            json.dump(settings_data, f)
+    except Exception as e:
+        logger.warning(f"Failed to write intuned settings to {settings_path}: {e}")

runtime/browser/launch_chromium.py

@@ -8,6 +8,11 @@ from typing import TYPE_CHECKING
 
 import anyio
 
+from runtime.browser.extensions import build_extensions_list
+from runtime.browser.extensions.intuned_extension import get_intuned_worker
+from runtime.browser.extensions.intuned_extension import is_intuned_extension_enabled
+from runtime.browser.extensions.intuned_extension import setup_intuned_extension
+
 from .helpers import get_local_cdp_address
 from .helpers import get_proxy_env
 from .helpers import wait_on_cdp_address
@@ -80,15 +85,36 @@ async def launch_chromium(
             if cdp_port:
                 extra_args.append(f"--remote-debugging-port={cdp_port}")
 
+            args_to_ignore = [
+                "--disable-extensions",
+                "--disable-component-extensions-with-background-pages",
+                "--disable-background-networking",
+                "--disable-backgrounding-occluded-windows",
+                "--disable-background-timer-throttling",
+            ]
+            if is_intuned_extension_enabled():
+                extensions_list = build_extensions_list()
+                extensions = ",".join(extensions_list)
+                extra_args.append("--disable-extensions-except=" + extensions)
+                extra_args.append(f"--load-extension={extensions}")
+                await setup_intuned_extension()
+
+            if headless:
+                args_to_ignore.append("--headless=old")
+                extra_args.append("--headless=new")
             context = await playwright.chromium.launch_persistent_context(
                 os.fspath(user_preferences_dir),
                 headless=headless,
                 viewport=viewport,
                 proxy=proxy,
+                ignore_default_args=args_to_ignore,
                 user_agent=os.environ.get("USER_AGENT", default_user_agent),
                 args=extra_args,
                 **kwargs,
             )
+            if is_intuned_extension_enabled():
+                # wait for intuned extension to be ready
+                await get_intuned_worker(context)
             if cdp_port:
                 await wait_on_cdp_address(get_local_cdp_address(cdp_port))
 

runtime/types/__init__.py

@@ -4,6 +4,8 @@ from .run_types import RunAutomationErrorResult
 from .run_types import RunAutomationResult
 from .run_types import RunAutomationSuccessResult
 from .run_types import RunBody
+from .settings_types import CaptchaSolverSettings
+from .settings_types import IntunedJson
 
 __all__ = [
     "Payload",
@@ -12,4 +14,6 @@ __all__ = [
     "RunAutomationErrorResult",
     "RunAutomationSuccessResult",
     "PayloadToAppend",
+    "IntunedJson",
+    "CaptchaSolverSettings",
 ]

runtime/types/settings_types.py

@@ -0,0 +1,63 @@
+from typing import List
+
+from pydantic import BaseModel
+from pydantic import Field
+
+
+class CaptchaSettings(BaseModel):
+    enabled: bool = Field(default=False)
+
+
+class CustomCaptchaSettings(CaptchaSettings):
+    model_config = {
+        "populate_by_name": True,
+        "serialize_by_alias": True,
+    }
+
+    image_locators: List[str] = Field(alias="imageLocators", default=[])
+    submit_locators: List[str] = Field(alias="submitLocators", default=[])
+    input_locators: List[str] = Field(alias="inputLocators", default=[])
+
+
+class TextCaptchaSettings(CaptchaSettings):
+    model_config = {
+        "populate_by_name": True,
+        "serialize_by_alias": True,
+    }
+    label_locators: List[str] = Field(alias="labelLocators", default=[])
+    submit_locators: List[str] = Field(alias="submitLocators", default=[])
+    input_locators: List[str] = Field(alias="inputLocators", default=[])
+
+
+class CaptchaSolverSettings(BaseModel):
+    model_config = {
+        "populate_by_name": True,
+        "serialize_by_alias": True,
+    }
+
+    enabled: bool = Field(default=False)
+    cloudflare: CaptchaSettings = Field(default_factory=CaptchaSettings)
+    google_recaptcha_v2: CaptchaSettings = Field(alias="googleRecaptchaV2", default_factory=CaptchaSettings)
+    google_recaptcha_v3: CaptchaSettings = Field(alias="googleRecaptchaV3", default_factory=CaptchaSettings)
+    awscaptcha: CaptchaSettings = Field(default_factory=CaptchaSettings)
+    hcaptcha: CaptchaSettings = Field(default_factory=CaptchaSettings)
+    funcaptcha: CaptchaSettings = Field(default_factory=CaptchaSettings)
+    geetest: CaptchaSettings = Field(default_factory=CaptchaSettings)
+    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}
+    )
+
+
+class IntunedJson(BaseModel):
+    model_config = {"populate_by_name": True}
+
+    class _AuthSessions(BaseModel):
+        enabled: bool
+
+    auth_sessions: _AuthSessions = Field(alias="authSessions")
+    project_name: str | None = Field(alias="projectName", default=None)
+    workspace_id: str | None = Field(alias="workspaceId", default=None)
+    captcha_solver: CaptchaSolverSettings | None = Field(alias="captchaSolver", default=None)

runtime/utils/__init__.py

@@ -0,0 +1,3 @@
+from .config_loader import load_intuned_json
+
+__all__ = ["load_intuned_json"]

runtime/utils/config_loader.py

@@ -0,0 +1,17 @@
+from anyio import Path
+
+from runtime.types import IntunedJson
+
+
+async def load_intuned_json() -> IntunedJson | None:
+    """
+    Load the Intuned.json configuration file.
+    Returns None if file doesn't exist or fails to parse.
+    """
+    intuned_json_path = Path("Intuned.json")
+    if not await intuned_json_path.exists():
+        return None
+    try:
+        return IntunedJson.model_validate_json(await intuned_json_path.read_text())
+    except Exception:
+        return None