intuned-runtime 1.3.5__py3-none-any.whl → 1.3.6__py3-none-any.whl

{intuned_runtime-1.3.5.dist-info → intuned_runtime-1.3.6.dist-info}/METADATA

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

{intuned_runtime-1.3.5.dist-info → intuned_runtime-1.3.6.dist-info}/RECORD

@@ -71,12 +71,12 @@ runtime/backend_functions/get_auth_session_parameters.py,sha256=pOvB7XiWpphEuBpa
 runtime/browser/__init__.py,sha256=EPWfa4ZmdR8GJqh2qcsx1ZvHmCYiUYrQ-zeHYVapH9s,285
 runtime/browser/extensions/__init__.py,sha256=Z97932wq-htiw4yEejV21oZfqdOm1VjRbuotlseSSAY,194
 runtime/browser/extensions/helpers.py,sha256=W3XiOf66J_xWpa4-U7hQjW0CfAucCYz12pBcIRnzLTQ,387
-runtime/browser/extensions/intuned_extension.py,sha256=aruIMs2wO7G-B-_zJ6S8cWtvmXwv3MxEIOkDukVJmEM,2942
-runtime/browser/extensions/intuned_extension_server.py,sha256=GLtbWsbvMw0vSMtL87_sDPab_tJQ9Il7TEBm_YDDmvE,7066
+runtime/browser/extensions/intuned_extension.py,sha256=RskyxYjW989KOieXgdmSIZcZleBIjlZHKessHAiOvus,3013
+runtime/browser/extensions/intuned_extension_server.py,sha256=7VZyJR-Qq11SGtxBwTWwjfdjJxWajQqeXkRs1H5Mu84,6908
 runtime/browser/helpers.py,sha256=CwgiBToawPgwAY9nIGkGHW544N7Db_OgKmS-SHkN2pU,1255
 runtime/browser/launch_browser.py,sha256=MFo9Nb9eQgGO3w3ngRp9epzolcTBvekDQudZwIE6_74,2516
 runtime/browser/launch_camoufox.py,sha256=TBOAwwipNGlbtMdFYnGkVM0ppLU44vWNkMGZA5uPZCE,1787
-runtime/browser/launch_chromium.py,sha256=VZ5xuENwwCahTL-hwWeanuTRtmJ7OhN1aAKDrMoIjX8,9088
+runtime/browser/launch_chromium.py,sha256=T-C89bhRqC3XhJdNv_1AGcXQM8oqCCGBX1ijNhRjovc,9285
 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
@@ -90,7 +90,7 @@ runtime/helpers/__init__.py,sha256=rkywrr_76AMaIsAAjsVmmfLh8BjB5_E6AeJY5sWFm6U,2
 runtime/helpers/attempt_store.py,sha256=YPwGHkdJNbC8rSiQ1vOReKNOQrjPT1wpO9ZDcQf530I,339
 runtime/helpers/extend_payload.py,sha256=towZF08WTpTTDBL4AV1bUU3XpKAQHEB66kGUfTICDe0,246
 runtime/helpers/extend_timeout.py,sha256=KjfSLEUrqoz7v00rhnPAKq2OmUzEzcv-eQ3M8c2U46s,348
-runtime/helpers/extensions.py,sha256=u8KE2PQR637UXOieYSGKb5n0B4LW44i4rERbeGrU2yY,12870
+runtime/helpers/extensions.py,sha256=_4M_bi76sgmYGNPh1vqaF_WuV-uJtTjqiMWtC2TX8zg,12926
 runtime/helpers/get_auth_session_parameters.py,sha256=7bopGhJ7vjKAn_UxnHSAah-k2rVOPbq0zi9FQOOCFds,472
 runtime/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtime/run/__init__.py,sha256=zxMYVb7hn147YTrhMLsrcX6-KTd71HLrYHstJOWeWXQ,52
@@ -105,14 +105,14 @@ 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=ro_An-vyFG1FKO0Ftq8n-B8oxO9ZWuba64jbT79WHkM,3301
+runtime/types/settings_types.py,sha256=pamaKw1kpsB_UpLGvIQRdE1gusmatVp8yhzMte57C4A,3469
 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.5.dist-info/METADATA,sha256=M_UJ3wo7wuIRq0dxi9SuyLR7hNDgKQdno0mU7jMO9Dk,5512
-intuned_runtime-1.3.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-intuned_runtime-1.3.5.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
-intuned_runtime-1.3.5.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
-intuned_runtime-1.3.5.dist-info/RECORD,,
+intuned_runtime-1.3.6.dist-info/METADATA,sha256=RPpd6JyWBVcTHN7myBd30qEN3Dq0wGceqT7LpTHN1lc,5512
+intuned_runtime-1.3.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+intuned_runtime-1.3.6.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
+intuned_runtime-1.3.6.dist-info/licenses/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
+intuned_runtime-1.3.6.dist-info/RECORD,,

runtime/browser/extensions/intuned_extension.py

@@ -51,13 +51,7 @@ async def get_intuned_worker(context: BrowserContext):
     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()
-    )
+async def get_intuned_extension_settings(captcha_settings: CaptchaSolverSettings) -> dict[str, Any]:
     context = IntunedContext.current()
     return {
         **captcha_settings.model_dump(mode="json"),
@@ -71,14 +65,20 @@ async def get_intuned_extension_settings() -> dict[str, Any]:
 async def setup_intuned_extension():
     if not is_intuned_extension_enabled():
         return
-    await setup_intuned_extension_server()
+    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()
+    )
+    await setup_intuned_extension_server(captcha_settings)
     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()
+    settings_data = await get_intuned_extension_settings(captcha_settings)
 
     try:
         with open(settings_path, "w") as f:

runtime/browser/extensions/intuned_extension_server.py

@@ -17,7 +17,6 @@ from waitress.server import create_server
 from waitress.server import MultiSocketServer
 
 from runtime.types import CaptchaSolverSettings
-from runtime.utils.config_loader import load_intuned_json
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -158,14 +157,10 @@ event_emitter: Optional[AsyncIOEventEmitter] = None
 extension_server: Optional[ExtensionServer] = None
 
 
-async def setup_intuned_extension_server():
+async def setup_intuned_extension_server(captcha_settings: Optional[CaptchaSolverSettings] = None):
     global event_emitter, extension_server
-    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()
-    )
+    if captcha_settings is None:
+        captcha_settings = CaptchaSolverSettings()
     extension_server = ExtensionServer()
     event_emitter = AsyncIOEventEmitter()
     await extension_server.start(port=captcha_settings.port)

runtime/browser/launch_chromium.py

@@ -13,6 +13,7 @@ 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 runtime.browser.extensions.intuned_extension_server import clean_intuned_extension_server
+from runtime.browser.extensions.intuned_extension_server import setup_intuned_extension_server
 
 from .helpers import get_local_cdp_address
 from .helpers import get_proxy_env
@@ -68,6 +69,8 @@ async def launch_chromium(
     extra_args: list[str] = []
     async with async_playwright() as playwright:
         if cdp_address is not None:
+            if is_intuned_extension_enabled():
+                await setup_intuned_extension_server()
             browser: Browser = await playwright.chromium.connect_over_cdp(cdp_address)
             context = browser.contexts[0]
             user_preferences_dir = None

runtime/helpers/extensions.py

@@ -202,25 +202,25 @@ async def _wait_for_captcha_solve_core(
 
     logger.debug(f"Page object: {page}")
 
-    # Execute function if provided
     result = None
     if func is not None:
         result = await func()
 
-    # Wait for network to settle if requested
     if wait_for_network_settled:
         try:
             await page.wait_for_load_state("networkidle", timeout=timeout)
         except Exception as e:
             logger.debug(f"Network idle wait failed: {e}")
 
-    # Check for captcha detection
     detection_event: EventRequest
     try:
         detection_event = await wait_for_captcha_event("CAPTCHA_DETECTED", timeout=timeout)
-    except:
-        logger.debug("CAPTCHA Not detected, skipping...")
+    except asyncio.TimeoutError:
+        logger.info("CAPTCHA Detection timed out")
         return result
+    except Exception as e:
+        logger.error(f"Error while waiting for captcha: {e}")
+        raise e
 
     logger.info("CAPTCHA Detected, awaiting result...")
     if detection_event.session_id is None:
@@ -263,9 +263,9 @@ async def _wait_for_captcha_solve_core(
 
         logger.info("CAPTCHA solved successfully")
 
-    except asyncio.TimeoutError:
+    except asyncio.TimeoutError as e:
         logger.error("CAPTCHA Result timeout")
-        raise
+        raise RuntimeError("CAPTCHA Solving timeout") from e
     except Exception as e:
         logger.error(f"CAPTCHA solve error: {e}")
         raise

runtime/types/settings_types.py

@@ -1,3 +1,4 @@
+import os
 import socket
 from typing import List
 from typing import Literal
@@ -6,7 +7,9 @@ from pydantic import BaseModel
 from pydantic import Field
 
 
-def get_random_port():
+def get_intuned_captcha_extension_port():
+    if "INTUNED_CAPTCHA_EXTENSION_PORT" in os.environ:
+        return int(os.environ["INTUNED_CAPTCHA_EXTENSION_PORT"])
     with socket.socket() as s:
         s.bind(("", 0))
         return s.getsockname()[1]
@@ -54,7 +57,7 @@ class CaptchaSolverSettings(BaseModel):
     }
 
     enabled: bool = Field(default=False)
-    port: int = Field(default_factory=get_random_port)
+    port: int = Field(default_factory=get_intuned_captcha_extension_port)
     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)