gemini-webapi 1.17.2__py3-none-any.whl → 1.18.0__py3-none-any.whl

gemini_webapi/components/gem_mixin.py

@@ -5,7 +5,7 @@ import orjson as json
 from ..constants import GRPC
 from ..exceptions import APIError
 from ..types import Gem, GemJar, RPCData
-from ..utils import running, logger
+from ..utils import extract_json_from_response, get_nested_value, logger
 
 
 class GemMixin:
@@ -41,7 +41,6 @@ class GemMixin:
 
         return self._gems
 
-    @running(retry=2)
     async def fetch_gems(self, include_hidden: bool = False, **kwargs) -> GemJar:
         """
         Get a list of available gems from gemini, including system predefined gems and user-created custom gems.
@@ -78,24 +77,32 @@ class GemMixin:
         )
 
         try:
-            response_json = json.loads(response.text.split("\n")[2])
+            response_json = extract_json_from_response(response.text)
 
             predefined_gems, custom_gems = [], []
 
             for part in response_json:
-                if part[-1] == "system":
-                    predefined_gems = json.loads(part[2])[2]
-                elif part[-1] == "custom":
-                    if custom_gems_container := json.loads(part[2]):
-                        custom_gems = custom_gems_container[2]
+                try:
+                    identifier = get_nested_value(part, [-1])
+                    part_body_str = get_nested_value(part, [2])
+                    if not part_body_str:
+                        continue
+
+                    part_body = json.loads(part_body_str)
+                    if identifier == "system":
+                        predefined_gems = get_nested_value(part_body, [2], [])
+                    elif identifier == "custom":
+                        custom_gems = get_nested_value(part_body, [2], [])
+                except json.JSONDecodeError:
+                    continue
 
             if not predefined_gems and not custom_gems:
                 raise Exception
         except Exception:
             await self.close()
-            logger.debug(f"Invalid response: {response.text}")
+            logger.debug(f"Unexpected response data structure: {response.text}")
             raise APIError(
-                "Failed to fetch gems. Invalid response data received. Client will try to re-initialize on next request."
+                "Failed to fetch gems. Unexpected response data structure. Client will try to re-initialize on next request."
             )
 
         self._gems = GemJar(
@@ -131,7 +138,6 @@ class GemMixin:
 
         return self._gems
 
-    @running(retry=2)
     async def create_gem(self, name: str, prompt: str, description: str = "") -> Gem:
         """
         Create a new custom gem.
@@ -175,19 +181,26 @@ class GemMixin:
                                 [],
                             ]
                         ]
-                    ).decode(),
+                    ).decode("utf-8"),
                 )
             ]
         )
 
         try:
-            response_json = json.loads(response.text.split("\n")[2])
-            gem_id = json.loads(response_json[0][2])[0]
+            response_json = extract_json_from_response(response.text)
+            part_body_str = get_nested_value(response_json, [0, 2], verbose=True)
+            if not part_body_str:
+                raise Exception
+
+            part_body = json.loads(part_body_str)
+            gem_id = get_nested_value(part_body, [0], verbose=True)
+            if not gem_id:
+                raise Exception
         except Exception:
             await self.close()
-            logger.debug(f"Invalid response: {response.text}")
+            logger.debug(f"Unexpected response data structure: {response.text}")
             raise APIError(
-                "Failed to create gem. Invalid response data received. Client will try to re-initialize on next request."
+                "Failed to create gem. Unexpected response data structure. Client will try to re-initialize on next request."
             )
 
         return Gem(
@@ -198,7 +211,6 @@ class GemMixin:
             predefined=False,
         )
 
-    @running(retry=2)
     async def update_gem(
         self, gem: Gem | str, name: str, prompt: str, description: str = ""
     ) -> Gem:
@@ -253,7 +265,7 @@ class GemMixin:
                                 0,
                             ],
                         ]
-                    ).decode(),
+                    ).decode("utf-8"),
                 )
             ]
         )
@@ -266,7 +278,6 @@ class GemMixin:
             predefined=False,
         )
 
-    @running(retry=2)
     async def delete_gem(self, gem: Gem | str, **kwargs) -> None:
         """
         Delete a custom gem.
@@ -283,6 +294,10 @@ class GemMixin:
             gem_id = gem
 
         await self._batch_execute(
-            [RPCData(rpcid=GRPC.DELETE_GEM, payload=json.dumps([gem_id]).decode())],
+            [
+                RPCData(
+                    rpcid=GRPC.DELETE_GEM, payload=json.dumps([gem_id]).decode("utf-8")
+                )
+            ],
             **kwargs,
         )

gemini_webapi/constants.py

@@ -25,6 +25,9 @@ class GRPC(StrEnum):
     UPDATE_GEM = "kHv0Vd"
     DELETE_GEM = "UXcSJb"
 
+    # Activity methods
+    BARD_ACTIVITY = "ESY5D"
+
 
 class Headers(Enum):
     GEMINI = {
@@ -32,7 +35,7 @@ class Headers(Enum):
         "Host": "gemini.google.com",
         "Origin": "https://gemini.google.com",
         "Referer": "https://gemini.google.com/",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36",
         "X-Same-Domain": "1",
     }
     ROTATE_COOKIES = {
@@ -46,21 +49,21 @@ class Model(Enum):
     G_3_0_PRO = (
         "gemini-3.0-pro",
         {
-            "x-goog-ext-525001261-jspb": '[1,null,null,null,"9d8ca3786ebdfbea",null,null,0,[4]]'
+            "x-goog-ext-525001261-jspb": '[1,null,null,null,"9d8ca3786ebdfbea",null,null,0,[4],null,null,1]'
         },
         False,
     )
-    G_2_5_PRO = (
-        "gemini-2.5-pro",
+    G_3_0_FLASH = (
+        "gemini-3.0-flash",
         {
-            "x-goog-ext-525001261-jspb": '[1,null,null,null,"4af6c7f5da75d65d",null,null,0,[4]]'
+            "x-goog-ext-525001261-jspb": '[1,null,null,null,"fbb127bbb056c959",null,null,0,[4],null,null,1]'
         },
         False,
     )
-    G_2_5_FLASH = (
-        "gemini-2.5-flash",
+    G_3_0_FLASH_THINKING = (
+        "gemini-3.0-flash-thinking",
         {
-            "x-goog-ext-525001261-jspb": '[1,null,null,null,"9ec249fc9ad08861",null,null,0,[4]]'
+            "x-goog-ext-525001261-jspb": '[1,null,null,null,"5bf011840784117a",null,null,0,[4],null,null,1]'
         },
         False,
     )
@@ -103,6 +106,7 @@ class ErrorCode(IntEnum):
     Known error codes returned from server.
     """
 
+    TEMPORARY_ERROR_1013 = 1013  # Randomly raised when generating with certain models, but disappears soon after
     USAGE_LIMIT_EXCEEDED = 1037
     MODEL_INCONSISTENT = 1050
     MODEL_HEADER_INVALID = 1052

gemini_webapi/types/candidate.py

@@ -24,7 +24,9 @@ class Candidate(BaseModel):
 
     rcid: str
     text: str
+    text_delta: str | None = None
     thoughts: str | None = None
+    thoughts_delta: str | None = None
     web_images: list[WebImage] = []
     generated_images: list[GeneratedImage] = []
 

gemini_webapi/types/image.py

@@ -1,8 +1,9 @@
 import re
 from pathlib import Path
 from datetime import datetime
+from typing import Any
 
-from httpx import AsyncClient, HTTPError
+from httpx import AsyncClient, Cookies, HTTPError
 from pydantic import BaseModel, field_validator
 
 from ..utils import logger
@@ -39,7 +40,7 @@ class Image(BaseModel):
         self,
         path: str = "temp",
         filename: str | None = None,
-        cookies: dict | None = None,
+        cookies: dict | Cookies | None = None,
         verbose: bool = False,
         skip_invalid_filename: bool = False,
     ) -> str | None:
@@ -121,16 +122,16 @@ class GeneratedImage(Image):
 
     Parameters
     ----------
-    cookies: `dict`
+    cookies: `dict | httpx.Cookies`
         Cookies used for requesting the content of the generated image, inherit from GeminiClient object or manually set.
         Should contain valid "__Secure-1PSID" and "__Secure-1PSIDTS" values.
     """
 
-    cookies: dict[str, str]
+    cookies: Any
 
     @field_validator("cookies")
     @classmethod
-    def validate_cookies(cls, v: dict) -> dict:
+    def validate_cookies(cls, v: Any) -> Any:
         if len(v) == 0:
             raise ValueError(
                 "GeneratedImage is designed to be initialized with same cookies as GeminiClient."
@@ -142,7 +143,7 @@ class GeneratedImage(Image):
         self,
         path: str = "temp",
         filename: str | None = None,
-        cookies: dict | None = None,
+        cookies: dict | Cookies | None = None,
         verbose: bool = False,
         skip_invalid_filename: bool = False,
         full_size: bool = True,

gemini_webapi/types/modeloutput.py

@@ -32,10 +32,18 @@ class ModelOutput(BaseModel):
     def text(self) -> str:
         return self.candidates[self.chosen].text
 
+    @property
+    def text_delta(self) -> str:
+        return self.candidates[self.chosen].text_delta or ""
+
     @property
     def thoughts(self) -> str | None:
         return self.candidates[self.chosen].thoughts
 
+    @property
+    def thoughts_delta(self) -> str:
+        return self.candidates[self.chosen].thoughts_delta or ""
+
     @property
     def images(self) -> list[Image]:
         return self.candidates[self.chosen].images

gemini_webapi/utils/__init__.py

@@ -1,14 +1,9 @@
 # flake8: noqa
 
-from asyncio import Task
-
 from .decorators import running
 from .get_access_token import get_access_token
 from .load_browser_cookies import load_browser_cookies
 from .logger import logger, set_log_level
-from .parsing import extract_json_from_response, get_nested_value
+from .parsing import extract_json_from_response, get_nested_value, parse_stream_frames
 from .rotate_1psidts import rotate_1psidts
 from .upload_file import upload_file, parse_file_name
-
-
-rotate_tasks: dict[str, Task] = {}

gemini_webapi/utils/decorators.py

@@ -1,13 +1,18 @@
 import asyncio
 import functools
+import inspect
 from collections.abc import Callable
 
-from ..exceptions import APIError, ImageGenerationError
+from ..exceptions import APIError
+
+
+DELAY_FACTOR = 5
 
 
 def running(retry: int = 0) -> Callable:
     """
     Decorator to check if GeminiClient is running before making a request.
+    Supports both regular async functions and async generators.
 
     Parameters
     ----------
@@ -16,38 +21,78 @@ def running(retry: int = 0) -> Callable:
     """
 
     def decorator(func):
-        @functools.wraps(func)
-        async def wrapper(client, *args, retry=retry, **kwargs):
-            try:
-                if not client._running:
-                    await client.init(
-                        timeout=client.timeout,
-                        auto_close=client.auto_close,
-                        close_delay=client.close_delay,
-                        auto_refresh=client.auto_refresh,
-                        refresh_interval=client.refresh_interval,
-                        verbose=False,
-                    )
-                    if client._running:
-                        return await func(client, *args, **kwargs)
-
-                    # Should not reach here
-                    raise APIError(
-                        f"Invalid function call: GeminiClient.{func.__name__}. Client initialization failed."
-                    )
-                else:
+        if inspect.isasyncgenfunction(func):
+
+            @functools.wraps(func)
+            async def wrapper(client, *args, current_retry=None, **kwargs):
+                if current_retry is None:
+                    current_retry = retry
+
+                try:
+                    if not client._running:
+                        await client.init(
+                            timeout=client.timeout,
+                            auto_close=client.auto_close,
+                            close_delay=client.close_delay,
+                            auto_refresh=client.auto_refresh,
+                            refresh_interval=client.refresh_interval,
+                            verbose=client.verbose,
+                        )
+
+                    if not client._running:
+                        raise APIError(
+                            f"Invalid function call: GeminiClient.{func.__name__}. Client initialization failed."
+                        )
+
+                    async for item in func(client, *args, **kwargs):
+                        yield item
+                except APIError:
+                    if current_retry > 0:
+                        delay = (retry - current_retry + 1) * DELAY_FACTOR
+                        await asyncio.sleep(delay)
+                        async for item in wrapper(
+                            client, *args, current_retry=current_retry - 1, **kwargs
+                        ):
+                            yield item
+                    else:
+                        raise
+
+            return wrapper
+        else:
+
+            @functools.wraps(func)
+            async def wrapper(client, *args, current_retry=None, **kwargs):
+                if current_retry is None:
+                    current_retry = retry
+
+                try:
+                    if not client._running:
+                        await client.init(
+                            timeout=client.timeout,
+                            auto_close=client.auto_close,
+                            close_delay=client.close_delay,
+                            auto_refresh=client.auto_refresh,
+                            refresh_interval=client.refresh_interval,
+                            verbose=client.verbose,
+                        )
+
+                    if not client._running:
+                        raise APIError(
+                            f"Invalid function call: GeminiClient.{func.__name__}. Client initialization failed."
+                        )
+
                     return await func(client, *args, **kwargs)
-            except APIError as e:
-                # Image generation takes too long, only retry once
-                if isinstance(e, ImageGenerationError):
-                    retry = min(1, retry)
+                except APIError:
+                    if current_retry > 0:
+                        delay = (retry - current_retry + 1) * DELAY_FACTOR
+                        await asyncio.sleep(delay)
 
-                if retry > 0:
-                    await asyncio.sleep(1)
-                    return await wrapper(client, *args, retry=retry - 1, **kwargs)
+                        return await wrapper(
+                            client, *args, current_retry=current_retry - 1, **kwargs
+                        )
 
-                raise
+                    raise
 
-        return wrapper
+            return wrapper
 
     return decorator

gemini_webapi/utils/get_access_token.py

@@ -4,7 +4,7 @@ import asyncio
 from asyncio import Task
 from pathlib import Path
 
-from httpx import AsyncClient, Response
+from httpx import AsyncClient, Cookies, Response
 
 from ..constants import Endpoint, Headers
 from ..exceptions import AuthError
@@ -13,8 +13,8 @@ from .logger import logger
 
 
 async def send_request(
-    cookies: dict, proxy: str | None = None
-) -> tuple[Response | None, dict]:
+    cookies: dict | Cookies, proxy: str | None = None
+) -> tuple[Response | None, Cookies]:
     """
     Send http request with provided cookies.
     """
@@ -25,16 +25,18 @@ async def send_request(
         headers=Headers.GEMINI.value,
         cookies=cookies,
         follow_redirects=True,
-        verify=False,
     ) as client:
-        response = await client.get(Endpoint.INIT.value)
+        response = await client.get(Endpoint.INIT)
         response.raise_for_status()
-        return response, cookies
+        return response, client.cookies
 
 
 async def get_access_token(
-    base_cookies: dict, proxy: str | None = None, verbose: bool = False
-) -> tuple[str, dict]:
+    base_cookies: dict | Cookies,
+    proxy: str | None = None,
+    verbose: bool = False,
+    verify: bool = True,
+) -> tuple[str, Cookies, str | None, str | None]:
     """
     Send a get request to gemini.google.com for each group of available cookies and return
     the value of "SNlM0e" as access token on the first successful request.
@@ -46,19 +48,19 @@ async def get_access_token(
 
     Parameters
     ----------
-    base_cookies : `dict`
+    base_cookies : `dict | httpx.Cookies`
         Base cookies to be used in the request.
     proxy: `str`, optional
         Proxy URL.
     verbose: `bool`, optional
         If `True`, will print more infomation in logs.
+    verify: `bool`, optional
+        Whether to verify SSL certificates.
 
     Returns
     -------
-    `str`
-        Access token.
-    `dict`
-        Cookies of the successful request.
+    `tuple[str, str | None, str | None, Cookies]`
+        By order: access token; build label; session id; cookies of the successful request.
 
     Raises
     ------
@@ -67,22 +69,22 @@ async def get_access_token(
     """
 
     async with AsyncClient(
-        http2=True,
-        proxy=proxy,
-        follow_redirects=True,
-        verify=False,
+        http2=True, proxy=proxy, follow_redirects=True, verify=verify
     ) as client:
-        response = await client.get(Endpoint.GOOGLE.value)
+        response = await client.get(Endpoint.GOOGLE)
 
-    extra_cookies = {}
+    extra_cookies = Cookies()
     if response.status_code == 200:
         extra_cookies = response.cookies
 
     tasks = []
 
     # Base cookies passed directly on initializing client
+    # We use a Jar to merge extra_cookies and base_cookies safely (preserving domains)
     if "__Secure-1PSID" in base_cookies and "__Secure-1PSIDTS" in base_cookies:
-        tasks.append(Task(send_request({**extra_cookies, **base_cookies}, proxy=proxy)))
+        jar = Cookies(extra_cookies)
+        jar.update(base_cookies)
+        tasks.append(Task(send_request(jar, proxy=proxy)))
     elif verbose:
         logger.debug(
             "Skipping loading base cookies. Either __Secure-1PSID or __Secure-1PSIDTS is not provided."
@@ -94,18 +96,25 @@ async def get_access_token(
         and Path(GEMINI_COOKIE_PATH)
         or (Path(__file__).parent / "temp")
     )
-    if "__Secure-1PSID" in base_cookies:
-        filename = f".cached_1psidts_{base_cookies['__Secure-1PSID']}.txt"
+
+    # Safely get __Secure-1PSID value
+    if isinstance(base_cookies, Cookies):
+        secure_1psid = base_cookies.get(
+            "__Secure-1PSID", domain=".google.com"
+        ) or base_cookies.get("__Secure-1PSID")
+    else:
+        secure_1psid = base_cookies.get("__Secure-1PSID")
+
+    if secure_1psid:
+        filename = f".cached_1psidts_{secure_1psid}.txt"
         cache_file = cache_dir / filename
         if cache_file.is_file():
             cached_1psidts = cache_file.read_text()
             if cached_1psidts:
-                cached_cookies = {
-                    **extra_cookies,
-                    **base_cookies,
-                    "__Secure-1PSIDTS": cached_1psidts,
-                }
-                tasks.append(Task(send_request(cached_cookies, proxy=proxy)))
+                jar = Cookies(extra_cookies)
+                jar.update(base_cookies)
+                jar.set("__Secure-1PSIDTS", cached_1psidts, domain=".google.com")
+                tasks.append(Task(send_request(jar, proxy=proxy)))
             elif verbose:
                 logger.debug("Skipping loading cached cookies. Cache file is empty.")
         elif verbose:
@@ -116,12 +125,11 @@ async def get_access_token(
         for cache_file in cache_files:
             cached_1psidts = cache_file.read_text()
             if cached_1psidts:
-                cached_cookies = {
-                    **extra_cookies,
-                    "__Secure-1PSID": cache_file.stem[16:],
-                    "__Secure-1PSIDTS": cached_1psidts,
-                }
-                tasks.append(Task(send_request(cached_cookies, proxy=proxy)))
+                jar = Cookies(extra_cookies)
+                psid = cache_file.stem[16:]
+                jar.set("__Secure-1PSID", psid, domain=".google.com")
+                jar.set("__Secure-1PSIDTS", cached_1psidts, domain=".google.com")
+                tasks.append(Task(send_request(jar, proxy=proxy)))
                 valid_caches += 1
 
         if valid_caches == 0 and verbose:
@@ -180,13 +188,20 @@ async def get_access_token(
     for i, future in enumerate(asyncio.as_completed(tasks)):
         try:
             response, request_cookies = await future
-            match = re.search(r'"SNlM0e":"(.*?)"', response.text)
-            if match:
+            snlm0e = re.search(r'"SNlM0e":\s*"(.*?)"', response.text)
+            if snlm0e:
+                cfb2h = re.search(r'"cfb2h":\s*"(.*?)"', response.text)
+                fdrfje = re.search(r'"FdrFJe":\s*"(.*?)"', response.text)
                 if verbose:
                     logger.debug(
                         f"Init attempt ({i + 1}/{len(tasks)}) succeeded. Initializing client..."
                     )
-                return match.group(1), request_cookies
+                return (
+                    snlm0e.group(1),
+                    cfb2h.group(1) if cfb2h else None,
+                    fdrfje.group(1) if fdrfje else None,
+                    request_cookies,
+                )
             elif verbose:
                 logger.debug(
                     f"Init attempt ({i + 1}/{len(tasks)}) failed. Cookies invalid."