gemini-webapi 1.16.0__py3-none-any.whl → 1.17.0__py3-none-any.whl

gemini_webapi/client.py

@@ -10,31 +10,33 @@ from httpx import AsyncClient, ReadTimeout, Response
 from .components import GemMixin
 from .constants import Endpoint, ErrorCode, Headers, Model
 from .exceptions import (
-    AuthError,
     APIError,
-    ImageGenerationError,
-    TimeoutError,
+    AuthError,
     GeminiError,
-    UsageLimitExceeded,
+    ImageGenerationError,
     ModelInvalid,
     TemporarilyBlocked,
+    TimeoutError,
+    UsageLimitExceeded,
 )
 from .types import (
-    WebImage,
-    GeneratedImage,
     Candidate,
-    ModelOutput,
     Gem,
+    GeneratedImage,
+    ModelOutput,
     RPCData,
+    WebImage,
 )
 from .utils import (
-    upload_file,
+    extract_json_from_response,
+    get_access_token,
+    get_nested_value,
+    logger,
     parse_file_name,
     rotate_1psidts,
-    get_access_token,
-    running,
     rotate_tasks,
-    logger,
+    running,
+    upload_file,
 )
 
 
@@ -42,7 +44,7 @@ class GeminiClient(GemMixin):
     """
     Async httpx client interface for gemini.google.com.
 
-    `secure_1psid` must be provided unless the optional dependency `browser-cookie3` is installed and
+    `secure_1psid` must be provided unless the optional dependency `browser-cookie3` is installed, and
     you have logged in to google.com in your local browser.
 
     Parameters
@@ -203,6 +205,7 @@ class GeminiClient(GemMixin):
         if self.close_task:
             self.close_task.cancel()
             self.close_task = None
+
         self.close_task = asyncio.create_task(self.close(self.close_delay))
 
     async def start_auto_refresh(self) -> None:
@@ -211,18 +214,25 @@ class GeminiClient(GemMixin):
         """
 
         while True:
+            new_1psidts: str | None = None
             try:
                 new_1psidts = await rotate_1psidts(self.cookies, self.proxy)
             except AuthError:
-                if task := rotate_tasks.get(self.cookies["__Secure-1PSID"]):
+                if task := rotate_tasks.get(self.cookies.get("__Secure-1PSID", "")):
                     task.cancel()
                 logger.warning(
-                    "Failed to refresh cookies. Background auto refresh task canceled."
+                    "AuthError: Failed to refresh cookies. Auto refresh task canceled."
                 )
+                return
+            except Exception as exc:
+                logger.warning(f"Unexpected error while refreshing cookies: {exc}")
 
-            logger.debug(f"Cookies refreshed. New __Secure-1PSIDTS: {new_1psidts}")
             if new_1psidts:
                 self.cookies["__Secure-1PSIDTS"] = new_1psidts
+                if self.running:
+                    self.client.cookies.set("__Secure-1PSIDTS", new_1psidts)
+                logger.debug("Cookies refreshed. New __Secure-1PSIDTS applied.")
+
             await asyncio.sleep(self.refresh_interval)
 
     @running(retry=2)
@@ -335,18 +345,24 @@ class GeminiClient(GemMixin):
                 f"Failed to generate contents. Request failed with status code {response.status_code}"
             )
         else:
+            response_json: list[Any] = []
+            body: list[Any] = []
+            body_index = 0
+
             try:
-                response_json = json.loads(response.text.split("\n")[2])
+                response_json = extract_json_from_response(response.text)
 
-                body = None
-                body_index = 0
                 for part_index, part in enumerate(response_json):
                     try:
-                        main_part = json.loads(part[2])
-                        if main_part[4]:
-                            body_index, body = part_index, main_part
+                        part_body = get_nested_value(part, [2])
+                        if not part_body:
+                            continue
+
+                        part_json = json.loads(part_body)
+                        if get_nested_value(part_json, [4]):
+                            body_index, body = part_index, part_json
                             break
-                    except (IndexError, TypeError, ValueError):
+                    except (TypeError, ValueError):
                         continue
 
                 if not body:
@@ -355,7 +371,8 @@ class GeminiClient(GemMixin):
                 await self.close()
 
                 try:
-                    match ErrorCode(response_json[0][5][2][0][1][0]):
+                    error_code = get_nested_value(response_json, [0, 5, 2, 0, 1, 0], -1)
+                    match ErrorCode(error_code):
                         case ErrorCode.USAGE_LIMIT_EXCEEDED:
                             raise UsageLimitExceeded(
                                 f"Failed to generate contents. Usage limit of {model.model_name} model has exceeded. Please try switching to another model."
@@ -385,44 +402,51 @@ class GeminiClient(GemMixin):
                     )
 
             try:
-                candidates = []
-                for candidate_index, candidate in enumerate(body[4]):
-                    text = candidate[1][0]
+                candidate_list: list[Any] = get_nested_value(body, [4], [])
+                output_candidates: list[Candidate] = []
+
+                for candidate_index, candidate in enumerate(candidate_list):
+                    rcid = get_nested_value(candidate, [0])
+                    if not rcid:
+                        continue  # Skip candidate if it has no rcid
+
+                    # Text output and thoughts
+                    text = get_nested_value(candidate, [1, 0], "")
                     if re.match(
                         r"^http://googleusercontent\.com/card_content/\d+", text
                     ):
-                        text = candidate[22] and candidate[22][0] or text
+                        text = get_nested_value(candidate, [22, 0]) or text
 
-                    try:
-                        thoughts = candidate[37][0][0]
-                    except (TypeError, IndexError):
-                        thoughts = None
-
-                    web_images = (
-                        candidate[12]
-                        and candidate[12][1]
-                        and [
+                    thoughts = get_nested_value(candidate, [37, 0, 0])
+
+                    # Web images
+                    web_images = []
+                    for web_img_data in get_nested_value(candidate, [12, 1], []):
+                        url = get_nested_value(web_img_data, [0, 0, 0])
+                        if not url:
+                            continue
+
+                        web_images.append(
                             WebImage(
-                                url=web_image[0][0][0],
-                                title=web_image[7][0],
-                                alt=web_image[0][4],
+                                url=url,
+                                title=get_nested_value(web_img_data, [7, 0], ""),
+                                alt=get_nested_value(web_img_data, [0, 4], ""),
                                 proxy=self.proxy,
                             )
-                            for web_image in candidate[12][1]
-                        ]
-                        or []
-                    )
+                        )
 
+                    # Generated images
                     generated_images = []
-                    if candidate[12] and candidate[12][7] and candidate[12][7][0]:
+                    if get_nested_value(candidate, [12, 7, 0]):
                         img_body = None
                         for img_part_index, part in enumerate(response_json):
                             if img_part_index < body_index:
                                 continue
-
                             try:
                                 img_part = json.loads(part[2])
-                                if img_part[4][candidate_index][12][7][0]:
+                                if get_nested_value(
+                                    img_part, [4, candidate_index, 12, 7, 0]
+                                ):
                                     img_body = img_part
                                     break
                             except (IndexError, TypeError, ValueError):
@@ -434,57 +458,73 @@ class GeminiClient(GemMixin):
                                 "If the error persists and is caused by the package, please report it on GitHub."
                             )
 
-                        img_candidate = img_body[4][candidate_index]
-
-                        text = re.sub(
-                            r"http://googleusercontent\.com/image_generation_content/\d+",
-                            "",
-                            img_candidate[1][0],
-                        ).rstrip()
-
-                        generated_images = [
-                            GeneratedImage(
-                                url=generated_image[0][3][3],
-                                title=(
-                                    f"[Generated Image {generated_image[3][6]}]"
-                                    if generated_image[3][6]
-                                    else "[Generated Image]"
-                                ),
-                                alt=(
-                                    generated_image[3][5][image_index]
-                                    if generated_image[3][5]
-                                    and len(generated_image[3][5]) > image_index
-                                    else (
-                                        generated_image[3][5][0]
-                                        if generated_image[3][5]
-                                        else ""
-                                    )
-                                ),
-                                proxy=self.proxy,
-                                cookies=self.cookies,
+                        img_candidate = get_nested_value(
+                            img_body, [4, candidate_index], []
+                        )
+
+                        if finished_text := get_nested_value(
+                            img_candidate, [1, 0]
+                        ):  # Only overwrite if new text is returned after image generation
+                            text = re.sub(
+                                r"http://googleusercontent\.com/image_generation_content/\d+",
+                                "",
+                                finished_text,
+                            ).rstrip()
+
+                        for img_index, gen_img_data in enumerate(
+                            get_nested_value(img_candidate, [12, 7, 0], [])
+                        ):
+                            url = get_nested_value(gen_img_data, [0, 3, 3])
+                            if not url:
+                                continue
+
+                            img_num = get_nested_value(gen_img_data, [3, 6])
+                            title = (
+                                f"[Generated Image {img_num}]"
+                                if img_num
+                                else "[Generated Image]"
                             )
-                            for image_index, generated_image in enumerate(
-                                img_candidate[12][7][0]
+
+                            alt_list = get_nested_value(gen_img_data, [3, 5], [])
+                            alt = (
+                                get_nested_value(alt_list, [img_index])
+                                or get_nested_value(alt_list, [0])
+                                or ""
                             )
-                        ]
 
-                    candidates.append(
+                            generated_images.append(
+                                GeneratedImage(
+                                    url=url,
+                                    title=title,
+                                    alt=alt,
+                                    proxy=self.proxy,
+                                    cookies=self.cookies,
+                                )
+                            )
+
+                    output_candidates.append(
                         Candidate(
-                            rcid=candidate[0],
+                            rcid=rcid,
                             text=text,
                             thoughts=thoughts,
                             web_images=web_images,
                             generated_images=generated_images,
                         )
                     )
-                if not candidates:
+
+                if not output_candidates:
                     raise GeminiError(
                         "Failed to generate contents. No output data found in response."
                     )
 
-                output = ModelOutput(metadata=body[1], candidates=candidates)
-            except (TypeError, IndexError):
-                logger.debug(f"Invalid response: {response.text}")
+                output = ModelOutput(
+                    metadata=get_nested_value(body, [1], []),
+                    candidates=output_candidates,
+                )
+            except (TypeError, IndexError) as e:
+                logger.debug(
+                    f"{type(e).__name__}: {e}; Invalid response structure: {response.text}"
+                )
                 raise APIError(
                     "Failed to parse response body. Data structure is invalid."
                 )

gemini_webapi/constants.py

@@ -43,9 +43,14 @@ class Headers(Enum):
 
 class Model(Enum):
     UNSPECIFIED = ("unspecified", {}, False)
+    G_3_0_PRO = (
+        "gemini-3.0-pro",
+        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"9d8ca3786ebdfbea",null,null,null,[4]]'},
+        False,
+    )
     G_2_5_FLASH = (
         "gemini-2.5-flash",
-        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"71c2d248d3b102ff",null,null,0,[4]]'},
+        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"9ec249fc9ad08861",null,null,0,[4]]'},
         False,
     )
     G_2_5_PRO = (
@@ -53,16 +58,6 @@ class Model(Enum):
         {"x-goog-ext-525001261-jspb": '[1,null,null,null,"4af6c7f5da75d65d",null,null,0,[4]]'},
         False,
     )
-    G_2_0_FLASH = (
-        "gemini-2.0-flash",
-        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"f299729663a2343f"]'},
-        False,
-    )  # Deprecated
-    G_2_0_FLASH_THINKING = (
-        "gemini-2.0-flash-thinking",
-        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"7ca48d02d802f20a"]'},
-        False,
-    )  # Deprecated
 
     def __init__(self, name, header, advanced_only):
         self.model_name = name

gemini_webapi/utils/__init__.py

@@ -3,11 +3,12 @@
 from asyncio import Task
 
 from .decorators import running
-from .upload_file import upload_file, parse_file_name
-from .rotate_1psidts import rotate_1psidts
 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 .rotate_1psidts import rotate_1psidts
+from .upload_file import upload_file, parse_file_name
 
 
 rotate_tasks: dict[str, Task] = {}

gemini_webapi/utils/parsing.py

@@ -0,0 +1,79 @@
+from typing import Any
+
+import orjson as json
+
+from .logger import logger
+
+
+def get_nested_value(data: list, path: list[int], default: Any = None) -> Any:
+    """
+    Safely get a value from a nested list by a sequence of indices.
+
+    Parameters
+    ----------
+    data: `list`
+        The nested list to traverse.
+    path: `list[int]`
+        A list of indices representing the path to the desired value.
+    default: `Any`, optional
+        The default value to return if the path is not found.
+    """
+
+    current = data
+
+    for i, key in enumerate(path):
+        try:
+            current = current[key]
+        except (IndexError, TypeError, KeyError) as e:
+            current_repr = repr(current)
+            if len(current_repr) > 200:
+                current_repr = f"{current_repr[:197]}..."
+
+            logger.debug(
+                f"{type(e).__name__}: parsing failed at path {path} (index {i}, key '{key}') "
+                f"while attempting to get value from `{current_repr}`"
+            )
+            return default
+
+    if current is None and default is not None:
+        return default
+
+    return current
+
+
+def extract_json_from_response(text: str) -> list:
+    """
+    Clean and extract the JSON content from a Google API response.
+
+    Parameters
+    ----------
+    text: `str`
+        The raw response text from a Google API.
+
+    Returns
+    -------
+    `list`
+        The extracted JSON array or object (should be an array).
+
+    Raises
+    ------
+    `TypeError`
+        If the input is not a string.
+    `ValueError`
+        If no JSON object is found or the response is empty.
+    """
+
+    if not isinstance(text, str):
+        raise TypeError(
+            f"Input text is expected to be a string, got {type(text).__name__} instead."
+        )
+
+    # Find the first line which is valid JSON
+    for line in text.splitlines():
+        try:
+            return json.loads(line.strip())
+        except json.JSONDecodeError:
+            continue
+
+    # If no JSON is found, raise ValueError
+    raise ValueError("Could not find a valid JSON object or array in the response.")

{gemini_webapi-1.16.0.dist-info → gemini_webapi-1.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.16.0
+Version: 1.17.0
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -905,16 +905,12 @@ asyncio.run(main())
 
 You can specify which language model to use by passing `model` argument to `GeminiClient.generate_content` or `GeminiClient.start_chat`. The default value is `unspecified`.
 
-Currently available models (as of June 12, 2025):
+Currently available models (as of November 20, 2025):
 
 - `unspecified` - Default model
+- `gemini-3.0-pro` - Gemini 3.0 Pro
+- `gemini-2.5-pro` - Gemini 2.5 Pro
 - `gemini-2.5-flash` - Gemini 2.5 Flash
-- `gemini-2.5-pro` - Gemini 2.5 Pro (daily usage limit imposed)
-
-Deprecated models (yet still working):
-
-- `gemini-2.0-flash` - Gemini 2.0 Flash
-- `gemini-2.0-flash-thinking` - Gemini 2.0 Flash Thinking
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.16.0.dist-info → gemini_webapi-1.17.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gemini_webapi/__init__.py,sha256=7ELCiUoI10ea3daeJxnv0UwqLVKpM7rxsgOZsPMstO8,150
-gemini_webapi/client.py,sha256=YlgBiIQWkxCjPaqMQ1Zs-MvRz6ww0U3uqdS__azqvwA,26827
-gemini_webapi/constants.py,sha256=ZzyZRqwJsqjvDdj3GYIdk0SpQVbKa1Vd5NwEsvIz6pI,2685
+gemini_webapi/client.py,sha256=9hcf0MOSiYbysv9rtcPm6wsRnb2aRLv8c8LL9Kxf8k4,28476
+gemini_webapi/constants.py,sha256=frgypJCzQvbtfNxYAOntyc9WSP0MiQ_RpsK4bJ-N6VI,2502
 gemini_webapi/exceptions.py,sha256=qkXrIpr0L7LtGbq3VcTO8D1xZ50pJtt0dDRp5I3uDSg,1038
 gemini_webapi/components/__init__.py,sha256=wolxuAJJ32-jmHOKgpsesexP7hXea1JMo5vI52wysTI,48
 gemini_webapi/components/gem_mixin.py,sha256=WPJkYDS4yQpLMBNQ94LQo5w59RgkllWaSiHsFG1k5GU,8795
@@ -10,15 +10,16 @@ gemini_webapi/types/gem.py,sha256=3Ppjq9V22Zp4Lb9a9ZnDviDKQpfSQf8UZxqOEjeEWd4,40
 gemini_webapi/types/grpc.py,sha256=S64h1oeC7ZJC50kmS_C2CQ7WVTanhJ4kqTFx5ZYayXI,917
 gemini_webapi/types/image.py,sha256=NhW1QY2Agzb6UbrIjZLnqxqukabDSGbmoCsVguzko10,5395
 gemini_webapi/types/modeloutput.py,sha256=h07kQOkL5r-oPLvZ59uVtO1eP4FGy5ZpzuYQzAeQdr8,1196
-gemini_webapi/utils/__init__.py,sha256=RIU1MBqYNjih0XMMt7wCxAA-X9KVF53nDbAjaxaGTo8,352
+gemini_webapi/utils/__init__.py,sha256=k8hV2zn6tD_BEpd1Xya6ED0deijsmzb1e9XxdFhJzIE,418
 gemini_webapi/utils/decorators.py,sha256=AuY6sU1_6_ZqeL92dTAi3eRPQ7zubB5VuBZEiz16aBM,1741
 gemini_webapi/utils/get_access_token.py,sha256=VjrHW8VMN3LPs6zCdXQtraWygurOjTY0SJZhe49aQwc,7265
 gemini_webapi/utils/load_browser_cookies.py,sha256=OHCfe27DpV_rloIDgW9Xpeb0mkfzbYONNiholw0ElXU,1791
 gemini_webapi/utils/logger.py,sha256=0VcxhVLhHBRDQutNCpapP1y_MhPoQ2ud1uIFLqxC3Z8,958
+gemini_webapi/utils/parsing.py,sha256=z-t0bDbXVIa0-3_ZmTK19PvL6zBM5vuy56z2jv1Yu1I,2105
 gemini_webapi/utils/rotate_1psidts.py,sha256=XjEeQnZS3ZI6wOl0Zb5CvsbIrg0BVVNas7cE6f3x_XE,1802
 gemini_webapi/utils/upload_file.py,sha256=SJOMr6kryK_ClrKmqI96fqZBNFOMPsyAvFINAGAU3rk,1468
-gemini_webapi-1.16.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-gemini_webapi-1.16.0.dist-info/METADATA,sha256=vRnA79JpF9eMcgjzCqbpok_UGTvw5EPYKRO1bFtjZ5Q,61426
-gemini_webapi-1.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gemini_webapi-1.16.0.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
-gemini_webapi-1.16.0.dist-info/RECORD,,
+gemini_webapi-1.17.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gemini_webapi-1.17.0.dist-info/METADATA,sha256=EuMINxma9gp-2YC-cd2w_mOecbBNAyJzUcIiZ-oT_1A,61299
+gemini_webapi-1.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gemini_webapi-1.17.0.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
+gemini_webapi-1.17.0.dist-info/RECORD,,