gemini-webapi 1.10.2__py3-none-any.whl → 1.11.1__py3-none-any.whl

gemini_webapi/client.py

@@ -8,8 +8,16 @@ from typing import Any, Optional
 
 from httpx import AsyncClient, ReadTimeout
 
-from .constants import Endpoint, Headers, Model
-from .exceptions import AuthError, APIError, TimeoutError, GeminiError
+from .constants import Endpoint, ErrorCode, Headers, Model
+from .exceptions import (
+    AuthError,
+    APIError,
+    TimeoutError,
+    GeminiError,
+    UsageLimitExceeded,
+    ModelInvalid,
+    TemporarilyBlocked,
+)
 from .types import WebImage, GeneratedImage, Candidate, ModelOutput
 from .utils import (
     upload_file,
@@ -376,10 +384,31 @@ class GeminiClient:
                     raise Exception
             except Exception:
                 await self.close()
-                logger.debug(f"Invalid response: {response.text}")
-                raise APIError(
-                    "Failed to generate contents. Invalid response data received. Client will try to re-initialize on next request."
-                )
+
+                try:
+                    match ErrorCode(response_json[0][5][2][0][1][0]):
+                        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."
+                            )
+                        case ErrorCode.MODEL_HEADER_INVALID:
+                            raise ModelInvalid(
+                                "Failed to generate contents. The specified model is not available. Please update gemini_webapi to the latest version. "
+                                "If the error persists and is caused by the package, please report it on GitHub."
+                            )
+                        case ErrorCode.IP_TEMPORARILY_BLOCKED:
+                            raise TemporarilyBlocked(
+                                "Failed to generate contents. Your IP address is temporarily blocked by Google. Please try using a proxy or waiting for a while."
+                            )
+                        case _:
+                            raise Exception
+                except GeminiError:
+                    raise
+                except Exception:
+                    logger.debug(f"Invalid response: {response.text}")
+                    raise APIError(
+                        "Failed to generate contents. Invalid response data received. Client will try to re-initialize on next request."
+                    )
 
             try:
                 candidates = []

gemini_webapi/constants.py

@@ -27,17 +27,22 @@ class Model(Enum):
     UNSPECIFIED = ("unspecified", {}, False)
     G_2_0_FLASH = (
         "gemini-2.0-flash",
-        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"f299729663a2343f"]'},
+        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"f299729663a2343f"]'},
         False,
     )
     G_2_0_FLASH_THINKING = (
         "gemini-2.0-flash-thinking",
         {"x-goog-ext-525001261-jspb": '[null,null,null,null,"7ca48d02d802f20a"]'},
         False,
+    )  # Deprecated
+    G_2_5_FLASH = (
+        "gemini-2.5-flash",
+        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"35609594dbe934d8"]'},
+        False,
     )
     G_2_5_PRO = (
         "gemini-2.5-pro",
-        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"2525e3954d185b3c"]'},
+        {"x-goog-ext-525001261-jspb": '[1,null,null,null,"2525e3954d185b3c"]'},
         False,
     )
     G_2_0_EXP_ADVANCED = (
@@ -64,3 +69,13 @@ class Model(Enum):
         raise ValueError(
             f"Unknown model name: {name}. Available models: {', '.join([model.model_name for model in cls])}"
         )
+
+
+class ErrorCode(Enum):
+    """
+    Known error codes returned from server.
+    """
+
+    USAGE_LIMIT_EXCEEDED = 1037
+    MODEL_HEADER_INVALID = 1052
+    IP_TEMPORARILY_BLOCKED = 1060

gemini_webapi/exceptions.py

@@ -28,3 +28,27 @@ class TimeoutError(GeminiError):
     """
 
     pass
+
+
+class UsageLimitExceeded(GeminiError):
+    """
+    Exception for model usage limit exceeded errors.
+    """
+
+    pass
+
+
+class ModelInvalid(GeminiError):
+    """
+    Exception for invalid model header string errors.
+    """
+
+    pass
+
+
+class TemporarilyBlocked(GeminiError):
+    """
+    Exception for 429 Too Many Requests when IP is temporarily blocked.
+    """
+
+    pass

{gemini_webapi-1.10.2.dist-info → gemini_webapi-1.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.10.2
+Version: 1.11.1
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -822,9 +822,10 @@ You can specify which language model to use by passing `model` argument to `Gemi
 
 Currently available models (as of Feb 5, 2025):
 
-- `unspecified` - Default model (same as `gemini-2.0-flash` if account does NOT have Gemini Advanced subscription)
+- `unspecified` - Default model
 - `gemini-2.0-flash` - Gemini 2.0 Flash
 - `gemini-2.0-flash-thinking` - Gemini 2.0 Flash Thinking Experimental
+- `gemini-2.5-flash` - Gemini 2.5 Flash
 - `gemini-2.5-pro` - Gemini 2.5 Pro (daily usage limit imposed)
 
 Models pending update (may not work as expected):

{gemini_webapi-1.10.2.dist-info → gemini_webapi-1.11.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 gemini_webapi/__init__.py,sha256=28uNIywK4vCXxENaSagNWUzhqr1RyNtLzDF6WRRM4KQ,194
-gemini_webapi/client.py,sha256=WsH07qepNSQzq4pdYIJW393Jr4gcdp8D64ti6GlDj9E,23065
-gemini_webapi/constants.py,sha256=pNq3Z42zFON1hYfktvdcth0rrYCSbqxjHMUGVuu0uvo,2189
-gemini_webapi/exceptions.py,sha256=6e-EXHGApi4iC0GDw7RKc3YqVK8UvEkHYaJyGQbReLw,548
+gemini_webapi/client.py,sha256=waD8cnC8ol00T64F9NHihB43Wxzui9guYwrOpTvGw-8,24460
+gemini_webapi/constants.py,sha256=xQloL6yHngniVEX5UnrsEKGTmMAieqxH7UUceefUVd8,2530
+gemini_webapi/exceptions.py,sha256=7p6R5WZsAgwmggqoTM3No0i76PhYbPAFBdS7iqBExLE,922
 gemini_webapi/types/__init__.py,sha256=d2kvXnE004s2E2KDmPPLi5N-BQ59FgDSlrGrO3Wphww,163
 gemini_webapi/types/candidate.py,sha256=dMoGr53WR7FYDRrXpG9Yd_n9YTHGwGaFHZ8zPt8RMWw,1178
 gemini_webapi/types/image.py,sha256=4BC8hxAWJrYFwzA60CivF1di4RZkzPKjcaSPPFKmRdY,5237
@@ -12,8 +12,8 @@ gemini_webapi/utils/load_browser_cookies.py,sha256=A5n_VsB7Rm8ck5lpy856UNJEhv30l
 gemini_webapi/utils/logger.py,sha256=PF4ROQq7scRRrWzeYdeYiYs2S2Jqr0bgjyrPbXVOCqE,816
 gemini_webapi/utils/rotate_1psidts.py,sha256=NyQ9OYPLBOcvpc8bodvEYDIVFrsYN0kdfc831lPEctM,1680
 gemini_webapi/utils/upload_file.py,sha256=SJOMr6kryK_ClrKmqI96fqZBNFOMPsyAvFINAGAU3rk,1468
-gemini_webapi-1.10.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-gemini_webapi-1.10.2.dist-info/METADATA,sha256=r6siif-Kb1A5bu4CXBGYfgyWVnFTXgXlInjsqPAehkQ,57210
-gemini_webapi-1.10.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gemini_webapi-1.10.2.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
-gemini_webapi-1.10.2.dist-info/RECORD,,
+gemini_webapi-1.11.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gemini_webapi-1.11.1.dist-info/METADATA,sha256=ClvGwberW9SgN8v81Zz0t0drx1ulluD6WQclybfzKnY,57167
+gemini_webapi-1.11.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+gemini_webapi-1.11.1.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
+gemini_webapi-1.11.1.dist-info/RECORD,,

{gemini_webapi-1.10.2.dist-info → gemini_webapi-1.11.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any