gemini-webapi 1.10.2__tar.gz → 1.11.1__tar.gz

{gemini_webapi-1.10.2 → gemini_webapi-1.11.1}/PKG-INFO

@@ -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 → gemini_webapi-1.11.1}/README.md

@@ -139,9 +139,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 → gemini_webapi-1.11.1}/src/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-1.10.2 → gemini_webapi-1.11.1}/src/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-1.10.2 → gemini_webapi-1.11.1}/src/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 → gemini_webapi-1.11.1}/src/gemini_webapi.egg-info/PKG-INFO

@@ -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 → gemini_webapi-1.11.1}/tests/test_client_features.py

@@ -7,6 +7,7 @@ from loguru import logger
 
 from gemini_webapi import GeminiClient, AuthError, set_log_level
 from gemini_webapi.constants import Model
+from gemini_webapi.exceptions import UsageLimitExceeded, ModelInvalid
 
 logging.getLogger("asyncio").setLevel(logging.ERROR)
 set_log_level("DEBUG")
@@ -19,22 +20,23 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
         )
 
         try:
-            await self.geminiclient.init()
+            await self.geminiclient.init(timeout=60)
         except AuthError as e:
             self.skipTest(e)
 
     @logger.catch(reraise=True)
     async def test_successful_request(self):
         response = await self.geminiclient.generate_content(
-            "Hello World!", model=Model.G_2_5_PRO
+            "Tell me a fact about today in history and illustrate it with a youtube video",
+            model=Model.G_2_5_FLASH,
         )
         logger.debug(response.text)
 
     @logger.catch(reraise=True)
     async def test_thinking_model(self):
         response = await self.geminiclient.generate_content(
-            "Tell me a fact about today in history and illustrate it with a youtube video",
-            model=Model.G_2_0_FLASH_THINKING,
+            "1+1=?",
+            model=Model.G_2_5_FLASH,
         )
         logger.debug(response.thoughts)
         logger.debug(response.text)
@@ -46,11 +48,16 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
                 logger.debug(f"Model {model.model_name} requires an advanced account")
                 continue
 
-            response = await self.geminiclient.generate_content(
-                "What's you language model version? Reply version number only.",
-                model=model,
-            )
-            logger.debug(f"Model version ({model.model_name}): {response.text}")
+            try:
+                response = await self.geminiclient.generate_content(
+                    "What's you language model version? Reply version number only.",
+                    model=model,
+                )
+                logger.debug(f"Model version ({model.model_name}): {response.text}")
+            except UsageLimitExceeded:
+                logger.debug(f"Model {model.model_name} usage limit exceeded")
+            except ModelInvalid:
+                logger.debug(f"Model {model.model_name} is not available anymore")
 
     @logger.catch(reraise=True)
     async def test_upload_files(self):