gemini-webapi 1.11.0__tar.gz → 1.12.0__tar.gz

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/.github/workflows/pypi-publish.yml

@@ -52,7 +52,7 @@ jobs:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
       - name: Retrieve built artifacts
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: dist
           path: dist

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.11.0
+Version: 1.12.0
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/src/gemini_webapi/client.py

@@ -12,10 +12,12 @@ from .constants import Endpoint, ErrorCode, Headers, Model
 from .exceptions import (
     AuthError,
     APIError,
+    ImageGenerationError,
     TimeoutError,
     GeminiError,
     UsageLimitExceeded,
     ModelInvalid,
+    TemporarilyBlocked,
 )
 from .types import WebImage, GeneratedImage, Candidate, ModelOutput
 from .utils import (
@@ -61,10 +63,15 @@ def running(retry: int = 0) -> callable:
                     )
                 else:
                     return await func(client, *args, **kwargs)
-            except APIError:
+            except APIError as e:
+                # Image generation takes too long, only retry once
+                if isinstance(e, ImageGenerationError):
+                    retry = min(1, retry)
+
                 if retry > 0:
                     await asyncio.sleep(1)
                     return await wrapper(client, *args, retry=retry - 1, **kwargs)
+
                 raise
 
         return wrapper
@@ -370,11 +377,12 @@ class GeminiClient:
                 response_json = json.loads(response.text.split("\n")[2])
 
                 body = None
-                for part in response_json:
+                body_index = 0
+                for part_index, part in enumerate(response_json):
                     try:
                         main_part = json.loads(part[2])
                         if main_part[4]:
-                            body = main_part
+                            body_index, body = part_index, main_part
                             break
                     except (IndexError, TypeError, ValueError):
                         continue
@@ -395,6 +403,10 @@ class GeminiClient:
                                 "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:
@@ -407,7 +419,7 @@ class GeminiClient:
 
             try:
                 candidates = []
-                for i, candidate in enumerate(body[4]):
+                for candidate_index, candidate in enumerate(body[4]):
                     text = candidate[1][0]
                     if re.match(
                         r"^http://googleusercontent\.com/card_content/\d+$", text
@@ -424,45 +436,59 @@ class GeminiClient:
                         and candidate[12][1]
                         and [
                             WebImage(
-                                url=image[0][0][0],
-                                title=image[7][0],
-                                alt=image[0][4],
+                                url=web_image[0][0][0],
+                                title=web_image[7][0],
+                                alt=web_image[0][4],
                                 proxy=self.proxy,
                             )
-                            for image in candidate[12][1]
+                            for web_image in candidate[12][1]
                         ]
                         or []
                     )
 
                     generated_images = []
                     if candidate[12] and candidate[12][7] and candidate[12][7][0]:
-                        image_generation_body = json.loads(response_json[1][2])
-                        image_generation_candidate = image_generation_body[4][i]
+                        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]:
+                                    img_body = img_part
+                                    break
+                            except (IndexError, TypeError, ValueError):
+                                continue
+
+                        if not img_body:
+                            raise ImageGenerationError(
+                                "Failed to parse generated images. Please update gemini_webapi to the latest version. "
+                                "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+$",
                             "",
-                            image_generation_candidate[1][0],
+                            img_candidate[1][0],
                         ).rstrip()
 
-                        if (
-                            image_generation_candidate[12]
-                            and image_generation_candidate[12][7]
-                            and image_generation_candidate[12][7][0]
-                        ):
-                            generated_images = [
-                                GeneratedImage(
-                                    url=image[0][3][3],
-                                    title=f"[Generated Image {image[3][6]}]",
-                                    alt=len(image[3][5]) > i
-                                    and image[3][5][i]
-                                    or image[3][5][0],
-                                    proxy=self.proxy,
-                                    cookies=self.cookies,
-                                )
-                                for i, image in enumerate(
-                                    image_generation_candidate[12][7][0]
-                                )
-                            ]
+                        generated_images = [
+                            GeneratedImage(
+                                url=generated_image[0][3][3],
+                                title=f"[Generated Image {generated_image[3][6]}]",
+                                alt=len(generated_image[3][5]) > image_index
+                                and generated_image[3][5][image_index]
+                                or generated_image[3][5][0],
+                                proxy=self.proxy,
+                                cookies=self.cookies,
+                            )
+                            for image_index, generated_image in enumerate(
+                                img_candidate[12][7][0]
+                            )
+                        ]
 
                     candidates.append(
                         Candidate(

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/src/gemini_webapi/constants.py

@@ -78,3 +78,4 @@ class ErrorCode(Enum):
 
     USAGE_LIMIT_EXCEEDED = 1037
     MODEL_HEADER_INVALID = 1052
+    IP_TEMPORARILY_BLOCKED = 1060

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/src/gemini_webapi/exceptions.py

@@ -14,6 +14,14 @@ class APIError(Exception):
     pass
 
 
+class ImageGenerationError(APIError):
+    """
+    Exception for generated image parsing errors.
+    """
+
+    pass
+
+
 class GeminiError(Exception):
     """
     Exception for errors returned from Gemini server which are not handled by the package.
@@ -44,3 +52,11 @@ class ModelInvalid(GeminiError):
     """
 
     pass
+
+
+class TemporarilyBlocked(GeminiError):
+    """
+    Exception for 429 Too Many Requests when IP is temporarily blocked.
+    """
+
+    pass

{gemini_webapi-1.11.0 → gemini_webapi-1.12.0}/src/gemini_webapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.11.0
+Version: 1.12.0
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE