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

gemini_webapi/client.py

@@ -12,6 +12,7 @@ from .constants import Endpoint, ErrorCode, Headers, Model
 from .exceptions import (
     AuthError,
     APIError,
+    ImageGenerationError,
     TimeoutError,
     GeminiError,
     UsageLimitExceeded,
@@ -62,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
@@ -371,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
@@ -412,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
@@ -429,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/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.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.11.1
+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.1.dist-info → gemini_webapi-1.12.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 gemini_webapi/__init__.py,sha256=28uNIywK4vCXxENaSagNWUzhqr1RyNtLzDF6WRRM4KQ,194
-gemini_webapi/client.py,sha256=waD8cnC8ol00T64F9NHihB43Wxzui9guYwrOpTvGw-8,24460
+gemini_webapi/client.py,sha256=sxzFXfi4OGn2yLuPywVLyWo40LcHNdSWL3YXivTaJ1o,25398
 gemini_webapi/constants.py,sha256=xQloL6yHngniVEX5UnrsEKGTmMAieqxH7UUceefUVd8,2530
-gemini_webapi/exceptions.py,sha256=7p6R5WZsAgwmggqoTM3No0i76PhYbPAFBdS7iqBExLE,922
+gemini_webapi/exceptions.py,sha256=qkXrIpr0L7LtGbq3VcTO8D1xZ50pJtt0dDRp5I3uDSg,1038
 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.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.12.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gemini_webapi-1.12.0.dist-info/METADATA,sha256=lCgrSQ-CJuWI6yyHaYE5JKJtyfbCTLzSDqOgPBIDYdM,57167
+gemini_webapi-1.12.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+gemini_webapi-1.12.0.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
+gemini_webapi-1.12.0.dist-info/RECORD,,

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

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