gemini-webapi 1.17.1__py3-none-any.whl → 1.17.3__py3-none-any.whl

gemini_webapi/client.py

@@ -68,7 +68,7 @@ class GeminiClient(GemMixin):
     __slots__ = [
         "cookies",
         "proxy",
-        "running",
+        "_running",
         "client",
         "access_token",
         "timeout",
@@ -91,7 +91,7 @@ class GeminiClient(GemMixin):
         super().__init__()
         self.cookies = {}
         self.proxy = proxy
-        self.running: bool = False
+        self._running: bool = False
         self.client: AsyncClient | None = None
         self.access_token: str | None = None
         self.timeout: float = 300
@@ -142,7 +142,6 @@ class GeminiClient(GemMixin):
             )
 
             self.client = AsyncClient(
-                http2=True,
                 timeout=timeout,
                 proxy=self.proxy,
                 follow_redirects=True,
@@ -152,7 +151,7 @@ class GeminiClient(GemMixin):
             )
             self.access_token = access_token
             self.cookies = valid_cookies
-            self.running = True
+            self._running = True
 
             self.timeout = timeout
             self.auto_close = auto_close
@@ -188,7 +187,7 @@ class GeminiClient(GemMixin):
         if delay:
             await asyncio.sleep(delay)
 
-        self.running = False
+        self._running = False
 
         if self.close_task:
             self.close_task.cancel()
@@ -229,7 +228,7 @@ class GeminiClient(GemMixin):
 
             if new_1psidts:
                 self.cookies["__Secure-1PSIDTS"] = new_1psidts
-                if self.running:
+                if self._running:
                     self.client.cookies.set("__Secure-1PSIDTS", new_1psidts)
                 logger.debug("Cookies refreshed. New __Secure-1PSIDTS applied.")
 
@@ -380,7 +379,7 @@ class GeminiClient(GemMixin):
 
                 try:
                     error_code = get_nested_value(response_json, [0, 5, 2, 0, 1, 0], -1)
-                    match ErrorCode(error_code):
+                    match error_code:
                         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."

gemini_webapi/constants.py

@@ -103,6 +103,7 @@ class ErrorCode(IntEnum):
     Known error codes returned from server.
     """
 
+    TEMPORARY_ERROR_1013 = 1013  # Randomly raised when generating with certain models, but disappears soon after
     USAGE_LIMIT_EXCEEDED = 1037
     MODEL_INCONSISTENT = 1050
     MODEL_HEADER_INVALID = 1052

gemini_webapi/types/image.py

@@ -71,16 +71,17 @@ class Image(BaseModel):
         """
 
         filename = filename or self.url.split("/")[-1].split("?")[0]
-        try:
-            filename = re.search(r"^(.*\.\w+)", filename).group()
-        except AttributeError:
+        match = re.search(r"^(.*\.\w+)", filename)
+        if match:
+            filename = match.group()
+        else:
             if verbose:
                 logger.warning(f"Invalid filename: {filename}")
             if skip_invalid_filename:
                 return None
 
         async with AsyncClient(
-            http2=True, follow_redirects=True, cookies=cookies, proxy=self.proxy
+            follow_redirects=True, cookies=cookies, proxy=self.proxy
         ) as client:
             response = await client.get(self.url)
             if response.status_code == 200:
@@ -137,19 +138,33 @@ class GeneratedImage(Image):
         return v
 
     # @override
-    async def save(self, full_size=True, **kwargs) -> str | None:
+    async def save(
+        self,
+        path: str = "temp",
+        filename: str | None = None,
+        cookies: dict | None = None,
+        verbose: bool = False,
+        skip_invalid_filename: bool = False,
+        full_size: bool = True,
+    ) -> str | None:
         """
         Save the image to disk.
 
         Parameters
         ----------
+        path: `str`, optional
+            Path to save the image, by default will save to "./temp".
         filename: `str`, optional
             Filename to save the image, generated images are always in .png format, but file extension will not be included in the URL.
             And since the URL ends with a long hash, by default will use timestamp + end of the hash as the filename.
+        cookies: `dict`, optional
+            Cookies used for requesting the content of the image. If not provided, will use the cookies from the GeneratedImage instance.
+        verbose : `bool`, optional
+            If True, will print the path of the saved file or warning for invalid file name, by default False.
+        skip_invalid_filename: `bool`, optional
+            If True, will only save the image if the file name and extension are valid, by default False.
         full_size: `bool`, optional
-            If True, will modify the default preview (512*512) URL to get the full size image.
-        kwargs: `dict`, optional
-            Other arguments to pass to `Image.save`.
+            If True, will modify the default preview (512*512) URL to get the full size image, by default True.
 
         Returns
         -------
@@ -161,8 +176,10 @@ class GeneratedImage(Image):
             self.url += "=s2048"
 
         return await super().save(
-            filename=kwargs.pop("filename", None)
+            path=path,
+            filename=filename
             or f"{datetime.now().strftime('%Y%m%d%H%M%S')}_{self.url[-10:]}.png",
-            cookies=self.cookies,
-            **kwargs,
+            cookies=cookies or self.cookies,
+            verbose=verbose,
+            skip_invalid_filename=skip_invalid_filename,
         )

gemini_webapi/utils/decorators.py

@@ -1,10 +1,11 @@
 import asyncio
 import functools
+from collections.abc import Callable
 
 from ..exceptions import APIError, ImageGenerationError
 
 
-def running(retry: int = 0) -> callable:
+def running(retry: int = 0) -> Callable:
     """
     Decorator to check if GeminiClient is running before making a request.
 
@@ -18,7 +19,7 @@ def running(retry: int = 0) -> callable:
         @functools.wraps(func)
         async def wrapper(client, *args, retry=retry, **kwargs):
             try:
-                if not client.running:
+                if not client._running:
                     await client.init(
                         timeout=client.timeout,
                         auto_close=client.auto_close,
@@ -27,7 +28,7 @@ def running(retry: int = 0) -> callable:
                         refresh_interval=client.refresh_interval,
                         verbose=False,
                     )
-                    if client.running:
+                    if client._running:
                         return await func(client, *args, **kwargs)
 
                     # Should not reach here

gemini_webapi/utils/get_access_token.py

@@ -20,7 +20,6 @@ async def send_request(
     """
 
     async with AsyncClient(
-        http2=True,
         proxy=proxy,
         headers=Headers.GEMINI.value,
         cookies=cookies,
@@ -66,12 +65,7 @@ async def get_access_token(
         If all requests failed.
     """
 
-    async with AsyncClient(
-        http2=True,
-        proxy=proxy,
-        follow_redirects=True,
-        verify=False,
-    ) as client:
+    async with AsyncClient(proxy=proxy, follow_redirects=True, verify=False) as client:
         response = await client.get(Endpoint.GOOGLE.value)
 
     extra_cookies = {}

gemini_webapi/utils/parsing.py

@@ -24,15 +24,16 @@ def get_nested_value(data: list, path: list[int], default: Any = None) -> Any:
     for i, key in enumerate(path):
         try:
             current = current[key]
-        except (IndexError, TypeError, KeyError) as e:
+        except (IndexError, TypeError, KeyError):
             current_repr = repr(current)
             if len(current_repr) > 200:
                 current_repr = f"{current_repr[:197]}..."
 
             logger.debug(
-                f"{type(e).__name__}: parsing failed at path {path} (index {i}, key '{key}') "
-                f"while attempting to get value from `{current_repr}`"
+                f"Safe navigation: path {path} ended at index {i} (key '{key}'), "
+                f"returning default. Context: {current_repr}"
             )
+
             return default
 
     if current is None and default is not None:

gemini_webapi/utils/rotate_1psidts.py

@@ -43,7 +43,7 @@ async def rotate_1psidts(cookies: dict, proxy: str | None = None) -> str:
 
     # Check if the cache file was modified in the last minute to avoid 429 Too Many Requests
     if not (path.is_file() and time.time() - os.path.getmtime(path) <= 60):
-        async with AsyncClient(http2=True, proxy=proxy) as client:
+        async with AsyncClient(proxy=proxy) as client:
             response = await client.post(
                 url=Endpoint.ROTATE_COOKIES.value,
                 headers=Headers.ROTATE_COOKIES.value,

gemini_webapi/utils/upload_file.py

@@ -33,7 +33,7 @@ async def upload_file(file: str | Path, proxy: str | None = None) -> str:
     with open(file, "rb") as f:
         file = f.read()
 
-    async with AsyncClient(http2=True, proxy=proxy) as client:
+    async with AsyncClient(proxy=proxy) as client:
         response = await client.post(
             url=Endpoint.UPLOAD.value,
             headers=Headers.UPLOAD.value,

{gemini_webapi-1.17.1.dist-info → gemini_webapi-1.17.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.17.1
+Version: 1.17.3
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,7 +676,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx[http2]~=0.28.1
+Requires-Dist: httpx~=0.28.1
 Requires-Dist: loguru~=0.7.3
 Requires-Dist: orjson~=3.11.1
 Requires-Dist: pydantic~=2.12.2

{gemini_webapi-1.17.1.dist-info → gemini_webapi-1.17.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gemini_webapi/__init__.py,sha256=7ELCiUoI10ea3daeJxnv0UwqLVKpM7rxsgOZsPMstO8,150
-gemini_webapi/client.py,sha256=zcsJHaZAi_lOIOtwQ-6PqS2S6-8m_Jt3rZRK7cH0EBQ,29288
-gemini_webapi/constants.py,sha256=tm9y8oKuD3QhKXUbVXZKroYCoPpqgBJdSTwoeue43Ss,3295
+gemini_webapi/client.py,sha256=OJSScOnl6rUbDOJ7hz-jn_1u13_HdjczPJsstOgNTGw,29254
+gemini_webapi/constants.py,sha256=-UHHwSoY4pzEfRTGpfb8UMgCNVbgSc3RLSOZpVOyNpM,3409
 gemini_webapi/exceptions.py,sha256=qkXrIpr0L7LtGbq3VcTO8D1xZ50pJtt0dDRp5I3uDSg,1038
 gemini_webapi/components/__init__.py,sha256=wolxuAJJ32-jmHOKgpsesexP7hXea1JMo5vI52wysTI,48
 gemini_webapi/components/gem_mixin.py,sha256=WPJkYDS4yQpLMBNQ94LQo5w59RgkllWaSiHsFG1k5GU,8795
@@ -8,18 +8,18 @@ gemini_webapi/types/__init__.py,sha256=1DU4JEw2KHQJbtOgOuvoEXtzQCMwAkyo0koSFVdT9
 gemini_webapi/types/candidate.py,sha256=67BhY75toE5mVuB21cmHcTFtw332V_KmCjr3-9VTbJo,1477
 gemini_webapi/types/gem.py,sha256=3Ppjq9V22Zp4Lb9a9ZnDviDKQpfSQf8UZxqOEjeEWd4,4070
 gemini_webapi/types/grpc.py,sha256=S64h1oeC7ZJC50kmS_C2CQ7WVTanhJ4kqTFx5ZYayXI,917
-gemini_webapi/types/image.py,sha256=NhW1QY2Agzb6UbrIjZLnqxqukabDSGbmoCsVguzko10,5395
+gemini_webapi/types/image.py,sha256=9miYAu3htBjNScCWfBJ49b_RtWDW9XFWO1NRJDvLgM8,6173
 gemini_webapi/types/modeloutput.py,sha256=h07kQOkL5r-oPLvZ59uVtO1eP4FGy5ZpzuYQzAeQdr8,1196
 gemini_webapi/utils/__init__.py,sha256=k8hV2zn6tD_BEpd1Xya6ED0deijsmzb1e9XxdFhJzIE,418
-gemini_webapi/utils/decorators.py,sha256=AuY6sU1_6_ZqeL92dTAi3eRPQ7zubB5VuBZEiz16aBM,1741
-gemini_webapi/utils/get_access_token.py,sha256=VjrHW8VMN3LPs6zCdXQtraWygurOjTY0SJZhe49aQwc,7265
+gemini_webapi/utils/decorators.py,sha256=uzIXoZOC0_Om19bbVXf_nw2w2NhI2qJL1o45FU6o6fI,1780
+gemini_webapi/utils/get_access_token.py,sha256=twZtTtvOnGxHhikCOj1HGErj2r5dT_BNcvqv5A0dtXg,7194
 gemini_webapi/utils/load_browser_cookies.py,sha256=OHCfe27DpV_rloIDgW9Xpeb0mkfzbYONNiholw0ElXU,1791
 gemini_webapi/utils/logger.py,sha256=0VcxhVLhHBRDQutNCpapP1y_MhPoQ2ud1uIFLqxC3Z8,958
-gemini_webapi/utils/parsing.py,sha256=z-t0bDbXVIa0-3_ZmTK19PvL6zBM5vuy56z2jv1Yu1I,2105
-gemini_webapi/utils/rotate_1psidts.py,sha256=XjEeQnZS3ZI6wOl0Zb5CvsbIrg0BVVNas7cE6f3x_XE,1802
-gemini_webapi/utils/upload_file.py,sha256=SJOMr6kryK_ClrKmqI96fqZBNFOMPsyAvFINAGAU3rk,1468
-gemini_webapi-1.17.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-gemini_webapi-1.17.1.dist-info/METADATA,sha256=OlCVaM8XIgS_w6zxowLrxLxc5ksPf-3W27oodzH2_MM,61763
-gemini_webapi-1.17.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gemini_webapi-1.17.1.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
-gemini_webapi-1.17.1.dist-info/RECORD,,
+gemini_webapi/utils/parsing.py,sha256=wDQsK1RcfrPr7c6w1JpxoPjLtkFIkcPmTX8jjfleJf0,2080
+gemini_webapi/utils/rotate_1psidts.py,sha256=SIqkqjZrEAyXB38qTEY9apxHVwczpFut4I0A77eWIFk,1790
+gemini_webapi/utils/upload_file.py,sha256=z5p03l6oQP74wzF0MF-Kbnav5k1nb7uYyzx-f8pxSVI,1456
+gemini_webapi-1.17.3.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gemini_webapi-1.17.3.dist-info/METADATA,sha256=Ld5hDcwuox-uqslhP83-gzyYVEZa7wgOs5hX2NcG7Y4,61756
+gemini_webapi-1.17.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gemini_webapi-1.17.3.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
+gemini_webapi-1.17.3.dist-info/RECORD,,