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

{gemini_webapi-1.11.1 → gemini_webapi-1.12.1}/.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.1 → gemini_webapi-1.12.1}/PKG-INFO

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

{gemini_webapi-1.11.1 → gemini_webapi-1.12.1}/src/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-1.11.1 → gemini_webapi-1.12.1}/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.

{gemini_webapi-1.11.1 → gemini_webapi-1.12.1}/src/gemini_webapi/types/candidate.py

@@ -1,4 +1,5 @@
-from pydantic import BaseModel
+import html
+from pydantic import BaseModel, field_validator
 
 from .image import Image, WebImage, GeneratedImage
 
@@ -33,6 +34,17 @@ class Candidate(BaseModel):
     def __repr__(self):
         return f"Candidate(rcid='{self.rcid}', text='{len(self.text) <= 20 and self.text or self.text[:20] + '...'}', images={self.images})"
 
+    @field_validator("text", "thoughts")
+    @classmethod
+    def decode_html(cls, value: str) -> str:
+        """
+        Auto unescape HTML entities in text/thoughts if any.
+        """
+
+        if value:
+            value = html.unescape(value)
+        return value
+
     @property
     def images(self) -> list[Image]:
         return self.web_images + self.generated_images

{gemini_webapi-1.11.1 → gemini_webapi-1.12.1}/src/gemini_webapi.egg-info/PKG-INFO

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

{gemini_webapi-1.11.1 → gemini_webapi-1.12.1}/src/gemini_webapi.egg-info/SOURCES.txt

@@ -31,5 +31,6 @@ src/gemini_webapi/utils/logger.py
 src/gemini_webapi/utils/rotate_1psidts.py
 src/gemini_webapi/utils/upload_file.py
 tests/test_client_features.py
+tests/test_html_entity_decode.py
 tests/test_rotate_cookies.py
 tests/test_save_image.py

gemini_webapi-1.12.1/tests/test_html_entity_decode.py

@@ -0,0 +1,48 @@
+import unittest
+from gemini_webapi.types.candidate import Candidate
+
+
+class TestHtmlEntityDecode(unittest.TestCase):
+    def test_html_entity_decoding(self):
+        # Test HTML entity decoding functionality
+        html_encoded_text = (
+            "This is a code snippet: <code>print('Hello, World!')</code>"
+        )
+        expected_decoded_text = (
+            "This is a code snippet: <code>print('Hello, World!')</code>"
+        )
+
+        # Create Candidate instance which should automatically decode HTML entities
+        candidate = Candidate(
+            rcid="test_rcid",
+            text=html_encoded_text,
+            thoughts="Testing &lt;b&gt;HTML&lt;/b&gt; entity decoding",
+        )
+
+        # Verify that text property is correctly decoded
+        self.assertEqual(candidate.text, expected_decoded_text)
+
+        # Verify that thoughts property is correctly decoded
+        self.assertEqual(candidate.thoughts, "Testing <b>HTML</b> entity decoding")
+
+    def test_non_html_text(self):
+        # Test plain text without any HTML entities
+        plain_text = "This is regular text with no HTML entities"
+
+        candidate = Candidate(rcid="test_rcid", text=plain_text)
+
+        # Verify the text remains unchanged
+        self.assertEqual(candidate.text, plain_text)
+
+    def test_complex_html_entities(self):
+        # Test more complex combinations of HTML entities
+        complex_html = "&lt;div&gt;This has &amp;amp; character\n and &quot;quotes&quot;&lt;/div&gt;"
+        expected_decoded = '<div>This has &amp; character\n and "quotes"</div>'
+
+        candidate = Candidate(rcid="test_rcid", text=complex_html)
+
+        self.assertEqual(candidate.text, expected_decoded)
+
+
+if __name__ == "__main__":
+    unittest.main()