Refactor AntigravityProvider to improve retry logic on 503 errors; update BrowserConfig to load executable path and connection timeout from environment variables

Author: hlohaus

g4f/Provider/needs_auth/Antigravity.py

@@ -1190,14 +1190,15 @@ async def parse_sse_stream(stream: aiohttp.StreamReader) -> AsyncGenerator[Dict[
                 if not resp.ok:
                     if resp.status == 503:
                         try:
-                            max_retry_delay = int(max([d.get("retryDelay", 0) for d in (await resp.json(content_type=None)).get("error", {}).get("details", [])]))
+                            retry_delay = int(max([float(d.get("retryDelay", 0)) for d in (await resp.json(content_type=None)).get("error", {}).get("details", [])]))
                         except ValueError:
-                            max_retry_delay = 30  # Default retry delay if not specified
-                        debug.log(f"Received 503 error, retrying after {max_retry_delay}")
-                        await asyncio.sleep(max_retry_delay)
-                        resp = await session.post(url, json=req_body)
-                        if not resp.ok:
-                            debug.error(f"Retry after 503 failed with status {resp.status}")
+                            retry_delay = 30  # Default retry delay if not specified
+                        debug.log(f"Received 503 error, retrying after {retry_delay}")
+                        if retry_delay <= 120:
+                            await asyncio.sleep(retry_delay)
+                            resp = await session.post(url, json=req_body)
+                            if not resp.ok:
+                                debug.error(f"Retry after 503 failed with status {resp.status}")
                 if not resp.ok:
                     if resp.status == 401:
                         raise MissingAuthError("Unauthorized (401) from Antigravity API")

g4f/cookies.py

@@ -54,12 +54,19 @@ class BrowserConfig:
     port: int = None
     host: str = "127.0.0.1"
     impersonate: str = "chrome"
+    executable_path: str = None
+    connection_timeout: float = 0.25
 
     @staticmethod
     async def stop_browser():
         return None
 
-    browser_executable_path: str = None
+    @classmethod
+    def load_from_env(cls):
+        cls.port = os.environ.get("G4F_BROWSER_PORT", cls.port)
+        cls.host = os.environ.get("G4F_BROWSER_HOST", cls.host)
+        cls.executable_path = os.environ.get("G4F_BROWSER_EXECUTABLE_PATH", cls.executable_path)
+        cls.connection_timeout = float(os.environ.get("G4F_BROWSER_CONNECTION_TIMEOUT", cls.connection_timeout))
 
 COOKIE_DOMAINS = (
     ".bing.com",
@@ -214,8 +221,7 @@ def read_cookie_files(dir_path: Optional[str] = None, domains_filter: Optional[L
 
     AppConfig.load_from_env()
 
-    BrowserConfig.port = os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port)
-    BrowserConfig.host = os.environ.get("G4F_BROWSER_HOST", BrowserConfig.host)
+    BrowserConfig.load_from_env()
     if BrowserConfig.port:
         BrowserConfig.port = int(BrowserConfig.port)
         debug.log(f"Using browser: {BrowserConfig.host}:{BrowserConfig.port}")

g4f/requests/__init__.py

@@ -167,7 +167,7 @@ async def get_nodriver(
             'Install "zendriver" and "platformdirs" package | pip install -U zendriver platformdirs')
     user_data_dir = user_config_dir(f"g4f-{user_data_dir}") if user_data_dir and has_platformdirs else None
     if browser_executable_path is None:
-        browser_executable_path = BrowserConfig.browser_executable_path
+        browser_executable_path = BrowserConfig.executable_path
     if browser_executable_path is None:
         try:
             browser_executable_path = find_executable()
@@ -216,7 +216,7 @@ async def get_nodriver(
             browser_executable_path=browser_executable_path,
             port=BrowserConfig.port,
             host=BrowserConfig.host,
-            browser_connection_timeout=1,
+            connection_timeout=BrowserConfig.connection_timeout,
             **kwargs
         )
     except FileNotFoundError as e: