NixOS compatibility patches for botright 0.5.1

- Remove solver.install() call (hcaptcha_challenger 0.18+ removed it)
- Add PLAYWRIGHT_BROWSERS_PATH chromium detection for NixOS
- Update hcaptcha module to AgentV API (from unmerged PR Vinyzu#167)
- Graceful hcaptcha_solver init when GEMINI_API_KEY is missing
- Bump version to 0.5.1.nixos1

Author: gui-wf

botright/__init__.py

@@ -2,6 +2,6 @@
 from .modules.faker import Faker
 from .modules.proxy_manager import ProxyManager
 
-VERSION = "0.5.1"
+VERSION = "0.5.1.nixos1"
 
 __all__ = ["Botright", "Faker", "ProxyManager", "VERSION"]

botright/botright.py

@@ -7,7 +7,6 @@
 from typing import Any, Dict, List, Optional
 
 import browsers
-import hcaptcha_challenger as solver
 import loguru
 from async_class import AsyncObject
 from chrome_fingerprints import AsyncFingerprintGenerator
@@ -21,7 +20,10 @@
 
 logging.getLogger("websockets").setLevel(logging.WARNING)
 logging.getLogger("httpx").setLevel(logging.WARNING)
-loguru.logger.disable("hcaptcha_challenger")
+try:
+    loguru.logger.disable("hcaptcha_challenger")
+except Exception:
+    pass
 
 
 class Botright(AsyncObject):
@@ -77,8 +79,6 @@ async def __ainit__(
             use_undetected_playwright (bool, optional): Whether to use undetected_playwright . EXPERIMENTAL (TEMP). Defaults to False.
         """
 
-        # Init local-side of the ModelHub
-        solver.install(upgrade=True)
         # Starting Playwright
         if use_undetected_playwright:
             # (TODO: TEMP)
@@ -199,6 +199,15 @@ def get_browser_engine() -> browsers.Browser:
         Raises:
             EnvironmentError: If no Chromium based browser is found on the system.
         """
+        # NixOS: use Playwright bundled chromium via PLAYWRIGHT_BROWSERS_PATH
+        pw_browsers = os.environ.get("PLAYWRIGHT_BROWSERS_PATH", "")
+        if pw_browsers:
+            import glob
+            matches = glob.glob(os.path.join(pw_browsers, "chromium-*/chrome-linux*/chrome"))
+            if matches:
+                return {"browser_type": "chromium", "path": matches[0],
+                        "display_name": "Playwright Chromium", "version": "bundled"}
+
         # Ungoogled Chromium preferred (most stealthy)
         if chromium := browsers.get("chromium"):
             return chromium

botright/modules/hcaptcha.py

@@ -1,95 +1,48 @@
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from hcaptcha_challenger.agents import AgentT
+from hcaptcha_challenger.agent import AgentV, AgentConfig
+from hcaptcha_challenger.models import ChallengeSignal
 
 if TYPE_CHECKING:
     from botright.extended_typing import BrowserContext, Page
 
-tmp_dir = Path(__file__).parent.joinpath("tmp_dir")
-
 
 class hCaptcha:
     def __init__(self, browser: BrowserContext, page: Page) -> None:
-        """
-        Initialize an hCaptcha solver.
-
-        Args:
-            browser (BrowserContext): The Playwright browser context to use.
-            page (Page): The Playwright page where hCaptcha challenges will be solved.
-        """
         self.browser = browser
         self.page = page
-
-        self.retry_times = 8
-        self.hcaptcha_agent = AgentT.from_page(page=page, tmp_dir=tmp_dir, self_supervised=True)
+        self.hcaptcha_agent = AgentV(page=page, agent_config=AgentConfig())
 
     async def mock_captcha(self, rq_data: str) -> None:
-        """
-        Mock hCaptcha requests by intercepting network requests to getcaptcha.
-
-        Args:
-            rq_data (str): The data required for mocking the hCaptcha request.
-
-        This method mocks the hCaptcha request and captures the generated hCaptcha token.
-        """
-
         async def mock_json(route, request):
-
-            payload = {**request.post_data_json, "rqdata": rq_data, "hl": "en"} if rq_data else request.post_data_json
-            response = await self.page.request.post(request.url, form=payload, headers=request.headers)
+            payload = (
+                {**request.post_data_json, "rqdata": rq_data, "hl": "en"}
+                if rq_data
+                else request.post_data_json
+            )
+            response = await self.page.request.post(
+                request.url, form=payload, headers=request.headers
+            )
             await route.fulfill(response=response)
 
         await self.page.route("https://hcaptcha.com/getcaptcha/**", mock_json)
 
     async def solve_hcaptcha(self, rq_data: Optional[str] = None) -> Optional[str]:
-        """
-        Solve an hCaptcha challenge.
-
-        Args:
-            rq_data (Optional[str]): Additional data required for solving the hCaptcha challenge.
-
-        Returns:
-            Optional[str]: The hCaptcha token if successfully solved; otherwise, None.
-
-        This method captures the hCaptcha token by logging and mocking hCaptcha requests, then simulates clicking the
-        hCaptcha checkbox to solve the challenge.
-        """
-        # Mocking Captcha Request
         if rq_data:
             await self.mock_captcha(rq_data)
-        # Clicking Captcha Checkbox
-        await self.hcaptcha_agent.handle_checkbox()
-
-        for pth in range(1, self.retry_times):
-            result = await self.hcaptcha_agent.execute()
-            if result == self.hcaptcha_agent.status.CHALLENGE_BACKCALL:
-                await self.page.wait_for_timeout(500)
-                fl = self.page.frame_locator(self.hcaptcha_agent.HOOK_CHALLENGE)
-                await fl.locator("//div[@class='refresh button']").click()
-            elif result == self.hcaptcha_agent.status.CHALLENGE_SUCCESS:
-                if self.hcaptcha_agent.cr:
-                    captcha_token: str = self.hcaptcha_agent.cr.generated_pass_UUID
-                    return captcha_token
-
-        return f"Exceeded maximum retry times of {self.retry_times}"
-
-    async def get_hcaptcha(self, site_key: Optional[str] = "00000000-0000-0000-0000-000000000000", rq_data: Optional[str] = None) -> Optional[str]:
-        """
-        Get an hCaptcha token for a specific site.
-
-        Args:
-            site_key (Optional[str]): The site key for the hCaptcha challenge (default is a demo site key).
-            rq_data (Optional[str]): Additional data required for solving the hCaptcha challenge.
-
-        Returns:
-            Optional[str]: The hCaptcha token if successfully obtained; otherwise, None.
-
-        This method opens a new page, navigates to a specified hCaptcha demo page with the given site key, and
-        solves the hCaptcha challenge to obtain the token.
-        """
+        await self.hcaptcha_agent.robotic_arm.click_checkbox()
+        result = await self.hcaptcha_agent.wait_for_challenge()
+        if result == ChallengeSignal.SUCCESS and self.hcaptcha_agent.cr_list:
+            return self.hcaptcha_agent.cr_list[-1].generated_pass_UUID
+        return None
+
+    async def get_hcaptcha(
+        self,
+        site_key: str = "00000000-0000-0000-0000-000000000000",
+        rq_data: Optional[str] = None,
+    ) -> Optional[str]:
         page = await self.browser.new_page()
         await page.goto(f"https://accounts.hcaptcha.com/demo?sitekey={site_key}")
         return await page.solve_hcaptcha(rq_data=rq_data)

botright/playwright_mock/page.py

@@ -97,7 +97,10 @@ def __init__(self, page: PlaywrightPage, browser: BrowserContext, faker: Faker):
         else:
             self._keyboard = Keyboard(page.keyboard, self)
         self.cdp: Optional[PlaywrightCDPSession] = None
-        self.hcaptcha_solver = hcaptcha.hCaptcha(browser, self)
+        try:
+            self.hcaptcha_solver = hcaptcha.hCaptcha(browser, self)
+        except Exception:
+            self.hcaptcha_solver = None
         self.recaptcha_solver = AsyncChallenger(self)
 
         # Aliases