intuned-runtime 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

intuned_internal_cli/commands/browser/save_state.py

@@ -3,7 +3,7 @@ import os
 
 import arguably
 
-from runtime.browser import launch_chromium
+from runtime.browser import launch_browser
 from runtime.browser.storage_state import get_storage_state
 
 
@@ -21,7 +21,7 @@ async def browser__save_state(
         output_path (str): Path to save browser state to.
     """
 
-    async with launch_chromium(
+    async with launch_browser(
         cdp_address=cdp_address,
     ) as (context, _):
         storage_state = await get_storage_state(context)

intuned_internal_cli/commands/project/auth_session/load.py

@@ -3,7 +3,7 @@ import os
 
 import arguably
 
-from runtime.browser import launch_chromium
+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
@@ -26,7 +26,7 @@ async def project__auth_session__load(
     if not intuned_settings.auth_sessions.enabled:
         raise Exception("Auth sessions are not enabled")
 
-    async with launch_chromium(
+    async with launch_browser(
         cdp_address=cdp_address,
     ) as (context, _):
         auth_session_path = os.path.join(os.getcwd(), auth_session_path)

{intuned_runtime-1.1.0.dist-info → intuned_runtime-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: intuned-runtime
-Version: 1.1.0
+Version: 1.1.2
 Summary: Runtime commands for Intuned platform Python scrapers
 License: Elastic-2.0
 Keywords: runtime,intuned
@@ -17,6 +17,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
 Requires-Dist: arguably (>=1.3.0,<2.0.0)
+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: more-termcolor (>=1.1.3,<2.0.0)

{intuned_runtime-1.1.0.dist-info → intuned_runtime-1.1.2.dist-info}/RECORD

@@ -40,13 +40,13 @@ intuned_internal_cli/commands/ai_source/__init__.py,sha256=lg7owgcK8owNn2a4VBUP9
 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=eHKfvBfeFR_U9VQbsjOnIZjWepyDjNn9NL3naDYWP2s,841
+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=AFILp7m34nAO_RD3IfRpuJm5Zh0wnCRtBXqIrerdbwo,4565
 intuned_internal_cli/commands/project/auth_session/create.py,sha256=r-eYu3uLUo2mzF836CbVgu4oBzcIIDekzzFwwekxmg0,3374
-intuned_internal_cli/commands/project/auth_session/load.py,sha256=UUvg9Vyj15xiR44XlJzojLoFm5esv-o4E3qA3JqnBsE,1201
+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=FDYYkU24aURYbljyYLFo8wLF-nvb86EVr9gMEjAfeE0,12274
 intuned_internal_cli/commands/project/run_interface.py,sha256=4RyR8WZriIF7Va4z1wt-q6zZDQOI31n62Ho2dyimzUY,8717
@@ -63,12 +63,15 @@ runtime/__init__.py,sha256=87gDXuxUv_kGzQfuB1mh6DF-dDysJN8r684c7jGnHxc,144
 runtime/backend_functions/__init__.py,sha256=j2EaK4FK8bmdFtqc5FxtFwx1KhIn_7qKPChrrAhJI3s,119
 runtime/backend_functions/_call_backend_function.py,sha256=zuaf4mwYHSm5RTedhMdU66jAMAzdPYPMmXJE_V1xoyk,2869
 runtime/backend_functions/get_auth_session_parameters.py,sha256=pOvB7XiWpphEuBpazdKALw9EWgBU1PeY3gkzBfVLpkc,869
-runtime/browser/__init__.py,sha256=CRBpMS319LBz2FLxDjjCvQdOUCgHLIrQFscr_Zi5Hm0,160
-runtime/browser/launch_chromium.py,sha256=OVaE8ezjxCYA1NUSDdd3FczrfNCpG_528Vmsv4S6QGU,7916
+runtime/browser/__init__.py,sha256=EPWfa4ZmdR8GJqh2qcsx1ZvHmCYiUYrQ-zeHYVapH9s,285
+runtime/browser/helpers.py,sha256=b1Xp005adbl7ZeJrSEYgH2OPzrZEHxTPgGTsnS3OqS0,554
+runtime/browser/launch_browser.py,sha256=f71hLUDbIBEv5hhQVOQFTXleUm_X1kmEpp0kTx0SqZo,966
+runtime/browser/launch_camoufox.py,sha256=TBOAwwipNGlbtMdFYnGkVM0ppLU44vWNkMGZA5uPZCE,1787
+runtime/browser/launch_chromium.py,sha256=QY9Mxw8FImT_W23cT2zjTAeLvApzVHA_YSu0b77nfeA,7813
 runtime/browser/storage_state.py,sha256=fwLg8sP-H-vgt_6AJKNl03CpgyMVCQWWcN2cqswTQMs,3603
 runtime/context/__init__.py,sha256=hg8ejm4bJy4tNkwmZ9lKgYJx6bU7OgOdBS684Uv5XGg,73
 runtime/context/context.py,sha256=pl_0x77_d5CiAznz1qGSk6o9cW-msNvlCt-2eFoMKlA,1739
-runtime/env.py,sha256=h4BJI-XVSZKgtTxjkzj2HsyN3DlY5Ml9GZqeH4CKDE8,238
+runtime/env.py,sha256=OXxzLpM56AJVlX0gmG7Ph82xAfqZboW3kv2232lzXb4,306
 runtime/errors/__init__.py,sha256=oqiBSvT_yFLQ3hG0AbCUA3WYFaxkTDVkDMSy59xvBCo,688
 runtime/errors/auth_session_errors.py,sha256=6b4XTI8UCDHDPX4jEA8_HyrNUp4VZ1TrEA8DRh6Z3rM,228
 runtime/errors/run_api_errors.py,sha256=LdmOEHoUk7wjWSk0HQYqslfJNNmxVgga_0bankzvX-s,3341
@@ -80,7 +83,7 @@ runtime/helpers/get_auth_session_parameters.py,sha256=7bopGhJ7vjKAn_UxnHSAah-k2r
 runtime/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtime/run/__init__.py,sha256=zxMYVb7hn147YTrhMLsrcX6-KTd71HLrYHstJOWeWXQ,52
 runtime/run/intuned_settings.py,sha256=vy2-ktEzUfUp5Z90dp3l7jPKHNjgB-8GSMDgAY-rYaU,1074
-runtime/run/playwright_constructs.py,sha256=UZvP502fk4Hk8xtI9jMlyJ7jHLJsWt2SZyZjhet7L1A,576
+runtime/run/playwright_constructs.py,sha256=EIfnRlAi1k1wRiTT2OpPFVmrWwEeeiryuORibaLD1Xw,573
 runtime/run/pydantic_encoder.py,sha256=wJCljwwINSICvCJ0i2izp2RLkQ15nYglUQCyyjM40Jk,332
 runtime/run/run_api.py,sha256=iYekBi-mkBuBNvLIBXQ6RWvEDN7JhjSlX3i7a2td2P8,8952
 runtime/run/traces.py,sha256=fKzh11LqV47ujgq_9I2tdp-dgld566wffWaHwU_4gis,1123
@@ -89,8 +92,8 @@ runtime/types/payload.py,sha256=sty8HgDEn3nJbZrwEOMCXyuG7_ICGDwlBIIWSON5ABY,124
 runtime/types/run_types.py,sha256=-j-XKXfRkzlyoW-Doe0og2jbqMMQWjOTIUqRFEc8lHA,4582
 runtime_helpers/__init__.py,sha256=XBrEiE9yNC8Lgn8NgIkqNXbI6e4ap237E83Zj_nlhCQ,249
 runtime_helpers/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-intuned_runtime-1.1.0.dist-info/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
-intuned_runtime-1.1.0.dist-info/METADATA,sha256=SO-KZ2dpNlLDzqEQBZcOMC8_oie3r2wyw2D9ZSigXWQ,5217
-intuned_runtime-1.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-intuned_runtime-1.1.0.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
-intuned_runtime-1.1.0.dist-info/RECORD,,
+intuned_runtime-1.1.2.dist-info/LICENSE,sha256=9LIjQdgyU_ptzNIfItNCR7VmEHqYnrY1f1XwOreKFI0,3714
+intuned_runtime-1.1.2.dist-info/METADATA,sha256=HP4J-g2b6h37GwRyjtMffGhuHNP1yQfJogzxfr_aiHc,5299
+intuned_runtime-1.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+intuned_runtime-1.1.2.dist-info/entry_points.txt,sha256=ToMS2cqDeRmF1FGkflwoeD-Xz6jJV5p1zIbw9G7IxMg,85
+intuned_runtime-1.1.2.dist-info/RECORD,,

runtime/browser/__init__.py

@@ -1,4 +1,6 @@
+from .launch_browser import launch_browser
+from .launch_camoufox import launch_camoufox
 from .launch_chromium import dangerous_launch_chromium
 from .launch_chromium import launch_chromium
 
-__all__ = ["launch_chromium", "dangerous_launch_chromium"]
+__all__ = ["launch_chromium", "dangerous_launch_chromium", "launch_camoufox", "launch_browser"]

runtime/browser/helpers.py

@@ -0,0 +1,21 @@
+import os
+from typing import Optional
+from typing import TYPE_CHECKING
+
+from playwright.async_api import ProxySettings
+
+if TYPE_CHECKING:
+    from playwright.async_api import ProxySettings
+
+
+def get_proxy_env() -> Optional["ProxySettings"]:
+    server = os.getenv("PROXY_SERVER")
+    username = os.getenv("PROXY_USERNAME")
+    password = os.getenv("PROXY_PASSWORD")
+    if server is None or username is None or password is None:
+        return None
+    return {
+        "server": server,
+        "username": username,
+        "password": password,
+    }

runtime/browser/launch_browser.py

@@ -0,0 +1,31 @@
+from contextlib import asynccontextmanager
+
+from playwright.async_api import ProxySettings
+
+from runtime.env import get_browser_type
+
+from .launch_camoufox import launch_camoufox
+from .launch_chromium import launch_chromium
+
+
+@asynccontextmanager
+async def launch_browser(
+    proxy: ProxySettings | None = None,
+    headless: bool = False,
+    *,
+    cdp_address: str | None = None,
+):
+    browser_type = get_browser_type()
+    match browser_type:
+        case "camoufox":
+            async with launch_camoufox(headless=headless, proxy=proxy) as (context, page):
+                try:
+                    yield context, page
+                finally:
+                    await context.close()
+        case "chromium" | _:
+            async with launch_chromium(headless=headless, cdp_address=cdp_address, proxy=proxy) as (context, page):
+                try:
+                    yield context, page
+                finally:
+                    await context.close()

runtime/browser/launch_camoufox.py

@@ -0,0 +1,63 @@
+import logging
+import os
+from contextlib import asynccontextmanager
+from typing import Any
+from typing import AsyncGenerator
+from typing import Tuple
+
+import anyio
+from playwright.async_api import Browser
+from playwright.async_api import BrowserContext
+from playwright.async_api import Page
+
+from .helpers import get_proxy_env
+
+logger = logging.getLogger(__name__)
+
+
+async def create_user_dir():
+    # Create a temporary directory
+    playwright_temp_dir = anyio.Path(await anyio.mkdtemp(prefix="pw-"))
+    user_dir = playwright_temp_dir / "userdir"
+
+    return await user_dir.absolute()
+
+
+@asynccontextmanager
+async def launch_camoufox(
+    headless: bool = True,
+    timeout: int = 10,
+    **kwargs: Any,
+) -> AsyncGenerator[Tuple[BrowserContext, Page], None]:
+    from camoufox.async_api import AsyncCamoufox
+
+    dir = await create_user_dir()
+    if kwargs.get("proxy") is None:
+        proxy_env = get_proxy_env()
+    else:
+        proxy_env = kwargs.get("proxy")
+    kwargs.pop("proxy", None)
+    async with AsyncCamoufox(
+        main_world_eval=True,
+        headless=headless,
+        config={"forceScopeAccess": True},  # required
+        disable_coop=True,
+        geoip=True,
+        proxy=proxy_env,
+        persistent_context=True,
+        user_data_dir=dir,
+        i_know_what_im_doing=True,
+    ) as camoufox:
+        if isinstance(camoufox, Browser):
+            context = await camoufox.new_context()
+        else:
+            context = camoufox
+        context.set_default_timeout(timeout * 1000)
+
+        async def remove_dir_after_close(*_: Any, **__: Any) -> None:
+            if not dir:
+                return
+            os.system(f"rm -rf {os.path.realpath(dir)}")
+
+        context.once("close", remove_dir_after_close)
+        yield context, context.pages[0]

runtime/browser/launch_chromium.py

@@ -4,30 +4,14 @@ import logging
 import os
 from contextlib import asynccontextmanager
 from typing import Any
-from typing import Optional
-from typing import TYPE_CHECKING
 
 import anyio
 
-if TYPE_CHECKING:
-    from playwright.async_api import ProxySettings
+from .helpers import get_proxy_env
 
 logger = logging.getLogger(__name__)
 
 
-def get_proxy_env() -> Optional["ProxySettings"]:
-    server = os.getenv("PROXY_SERVER")
-    username = os.getenv("PROXY_USERNAME")
-    password = os.getenv("PROXY_PASSWORD")
-    if server is None or username is None or password is None:
-        return None
-    return {
-        "server": server,
-        "username": username,
-        "password": password,
-    }
-
-
 chromium_launch_args_to_ignore = [
     "--disable-field-trial-config",
     "--disable-background-networking",
@@ -85,16 +69,6 @@ async def create_user_dir_with_preferences():
     return await user_dir.absolute(), await playwright_temp_dir.absolute()
 
 
-extra_args = [
-    "--no-first-run",
-    "--disable-sync",
-    "--disable-translate",
-    "--disable-features=TranslateUI",
-    "--disable-features=NetworkService",
-    "--lang=en",
-    "--disable-blink-features=AutomationControlled",
-]
-
 default_user_agent = (
     "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36"
 )
@@ -110,6 +84,15 @@ async def launch_chromium(
     from playwright.async_api import async_playwright
     from playwright.async_api import Browser
 
+    extra_args = [
+        "--no-first-run",
+        "--disable-sync",
+        "--disable-translate",
+        "--disable-features=TranslateUI",
+        "--disable-features=NetworkService",
+        "--lang=en",
+        "--disable-blink-features=AutomationControlled",
+    ]
     async with async_playwright() as playwright:
         if cdp_address is not None:
             browser: Browser = await playwright.chromium.connect_over_cdp(cdp_address)
@@ -117,7 +100,10 @@ async def launch_chromium(
             user_preferences_dir = None
             dir_to_clean = None
         else:
-            user_preferences_dir, dir_to_clean = await create_user_dir_with_preferences()
+            (
+                user_preferences_dir,
+                dir_to_clean,
+            ) = await create_user_dir_with_preferences()
             if kwargs.get("proxy") is None:
                 proxy_env = get_proxy_env()
             else:
@@ -172,6 +158,15 @@ async def dangerous_launch_chromium(
     from playwright.async_api import async_playwright
     from playwright.async_api import Browser
 
+    extra_args = [
+        "--no-first-run",
+        "--disable-sync",
+        "--disable-translate",
+        "--disable-features=TranslateUI",
+        "--disable-features=NetworkService",
+        "--lang=en",
+        "--disable-blink-features=AutomationControlled",
+    ]
     playwright = await async_playwright().start()
     if cdp_url is not None:
         logging.info(f"Connecting to cdp: {cdp_url}")

runtime/env.py

@@ -11,3 +11,7 @@ def get_project_id():
 
 def get_functions_domain():
     return os.environ.get("FUNCTIONS_DOMAIN")
+
+
+def get_browser_type():
+    return os.environ.get("BROWSER_TYPE")

runtime/run/playwright_constructs.py

@@ -3,8 +3,7 @@ from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from playwright.async_api import ProxySettings
-
-from ..browser import launch_chromium
+from ..browser import launch_browser
 
 
 @asynccontextmanager
@@ -14,7 +13,7 @@ async def get_production_playwright_constructs(
     *,
     cdp_address: str | None = None,
 ):
-    async with launch_chromium(headless=headless, cdp_address=cdp_address, proxy=proxy) as (context, page):
+    async with launch_browser(headless=headless, cdp_address=cdp_address, proxy=proxy) as (context, page):
         try:
             yield context, page
         finally: