gemini-webapi 1.14.2__tar.gz → 1.14.4__tar.gz

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/.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.3.0
+        uses: actions/download-artifact@v5.0.0
         with:
           name: dist
           path: dist

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.14.2
+Version: 1.14.4
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -678,7 +678,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx[http2]~=0.28.1
 Requires-Dist: loguru~=0.7.3
-Requires-Dist: orjson~=3.10.18
+Requires-Dist: orjson~=3.11.1
 Requires-Dist: pydantic~=2.11.5
 Dynamic: license-file
 
@@ -931,10 +931,14 @@ asyncio.run(main())
 
 System prompt can be applied to conversations via [Gemini Gems](https://gemini.google.com/gems/view). To use a gem, you can pass `gem` argument to `GeminiClient.generate_content` or `GeminiClient.start_chat`. `gem` can be either a string of gem id or a `gemini_webapi.Gem` object. Only one gem can be applied to a single conversation.
 
+> [!TIP]
+>
+> There are some system predefined gems that by default are not shown to users (and therefore may not work properly). Use `client.fetch_gems(include_hidden=True)` to include them in the fetch result.
+
 ```python
 async def main():
     # Fetch all gems for the current account, including both predefined and user-created ones
-    await client.fetch_gems()
+    await client.fetch_gems(include_hidden=False)
 
     # Once fetched, gems will be cached in `GeminiClient.gems`
     gems = client.gems

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/README.md

@@ -247,10 +247,14 @@ asyncio.run(main())
 
 System prompt can be applied to conversations via [Gemini Gems](https://gemini.google.com/gems/view). To use a gem, you can pass `gem` argument to `GeminiClient.generate_content` or `GeminiClient.start_chat`. `gem` can be either a string of gem id or a `gemini_webapi.Gem` object. Only one gem can be applied to a single conversation.
 
+> [!TIP]
+>
+> There are some system predefined gems that by default are not shown to users (and therefore may not work properly). Use `client.fetch_gems(include_hidden=True)` to include them in the fetch result.
+
 ```python
 async def main():
     # Fetch all gems for the current account, including both predefined and user-created ones
-    await client.fetch_gems()
+    await client.fetch_gems(include_hidden=False)
 
     # Once fetched, gems will be cached in `GeminiClient.gems`
     gems = client.gems

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/pyproject.toml

@@ -22,7 +22,7 @@ requires-python = ">=3.10"
 dependencies = [
     "httpx[http2]~=0.28.1",
     "loguru~=0.7.3",
-    "orjson~=3.10.18",
+    "orjson~=3.11.1",
     "pydantic~=2.11.5",
 ]
 dynamic = ["version"]

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi/client.py

@@ -1,14 +1,13 @@
 import asyncio
-import functools
-import itertools
 import re
 from asyncio import Task
 from pathlib import Path
 from typing import Any, Optional
 
 import orjson as json
-from httpx import AsyncClient, ReadTimeout
+from httpx import AsyncClient, ReadTimeout, Response
 
+from .components import GemMixin
 from .constants import Endpoint, ErrorCode, Headers, Model
 from .exceptions import (
     AuthError,
@@ -20,67 +19,27 @@ from .exceptions import (
     ModelInvalid,
     TemporarilyBlocked,
 )
-from .types import WebImage, GeneratedImage, Candidate, ModelOutput, Gem, GemJar
+from .types import (
+    WebImage,
+    GeneratedImage,
+    Candidate,
+    ModelOutput,
+    Gem,
+    RPCData,
+)
 from .utils import (
     upload_file,
     parse_file_name,
     rotate_1psidts,
     get_access_token,
     load_browser_cookies,
+    running,
     rotate_tasks,
     logger,
 )
 
 
-def running(retry: int = 0) -> callable:
-    """
-    Decorator to check if client is running before making a request.
-
-    Parameters
-    ----------
-    retry: `int`, optional
-        Max number of retries when `gemini_webapi.APIError` is raised.
-    """
-
-    def decorator(func):
-        @functools.wraps(func)
-        async def wrapper(client: "GeminiClient", *args, retry=retry, **kwargs):
-            try:
-                if not client.running:
-                    await client.init(
-                        timeout=client.timeout,
-                        auto_close=client.auto_close,
-                        close_delay=client.close_delay,
-                        auto_refresh=client.auto_refresh,
-                        refresh_interval=client.refresh_interval,
-                        verbose=False,
-                    )
-                    if client.running:
-                        return await func(client, *args, **kwargs)
-
-                    # Should not reach here
-                    raise APIError(
-                        f"Invalid function call: GeminiClient.{func.__name__}. Client initialization failed."
-                    )
-                else:
-                    return await func(client, *args, **kwargs)
-            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
-
-    return decorator
-
-
-class GeminiClient:
+class GeminiClient(GemMixin):
     """
     Async httpx client interface for gemini.google.com.
 
@@ -117,7 +76,7 @@ class GeminiClient:
         "close_task",
         "auto_refresh",
         "refresh_interval",
-        "_gems",
+        "_gems",  # From GemMixin
         "kwargs",
     ]
 
@@ -128,6 +87,7 @@ class GeminiClient:
         proxy: str | None = None,
         **kwargs,
     ):
+        super().__init__()
         self.cookies = {}
         self.proxy = proxy
         self.running: bool = False
@@ -139,7 +99,6 @@ class GeminiClient:
         self.close_task: Task | None = None
         self.auto_refresh: bool = True
         self.refresh_interval: float = 540
-        self._gems: GemJar | None = None
         self.kwargs = kwargs
 
         # Validate cookies
@@ -277,125 +236,6 @@ class GeminiClient:
                 self.cookies["__Secure-1PSIDTS"] = new_1psidts
             await asyncio.sleep(self.refresh_interval)
 
-    @property
-    def gems(self) -> GemJar:
-        """
-        Returns a `GemJar` object containing cached gems.
-        Only available after calling `GeminiClient.fetch_gems()`.
-
-        Returns
-        -------
-        :class:`GemJar`
-            Refer to `gemini_webapi.types.GemJar`.
-
-        Raises
-        ------
-        `RuntimeError`
-            If `GeminiClient.fetch_gems()` has not been called before accessing this property.
-        """
-
-        if self._gems is None:
-            raise RuntimeError(
-                "Gems not fetched yet. Call `GeminiClient.fetch_gems()` method to fetch gems from gemini.google.com."
-            )
-
-        return self._gems
-
-    @running(retry=2)
-    async def fetch_gems(self, **kwargs) -> GemJar:
-        """
-        Get a list of available gems from gemini, including system predefined gems and user-created custom gems.
-
-        Note that network request will be sent every time this method is called.
-        Once the gems are fetched, they will be cached and accessible via `GeminiClient.gems` property.
-
-        Returns
-        -------
-        :class:`GemJar`
-            Refer to `gemini_webapi.types.GemJar`.
-        """
-
-        try:
-            response = await self.client.post(
-                Endpoint.BATCH_EXEC,
-                data={
-                    "at": self.access_token,
-                    "f.req": json.dumps(
-                        [
-                            [
-                                ["CNgdBe", '[2,["en"],0]', None, "custom"],
-                                ["CNgdBe", '[3,["en"],0]', None, "system"],
-                            ]
-                        ]
-                    ).decode(),
-                },
-                **kwargs,
-            )
-        except ReadTimeout:
-            raise TimeoutError(
-                "Fetch gems request timed out, please try again. If the problem persists, "
-                "consider setting a higher `timeout` value when initializing GeminiClient."
-            )
-
-        if response.status_code != 200:
-            raise APIError(
-                f"Failed to fetch gems. Request failed with status code {response.status_code}"
-            )
-        else:
-            try:
-                response_json = json.loads(response.text.split("\n")[2])
-
-                predefined_gems, custom_gems = [], []
-
-                for part in response_json:
-                    if part[-1] == "system":
-                        predefined_gems = json.loads(part[2])[2]
-                    elif part[-1] == "custom":
-                        if custom_gems_container := json.loads(part[2]):
-                            custom_gems = custom_gems_container[2]
-
-                if not predefined_gems and not custom_gems:
-                    raise Exception
-            except Exception:
-                await self.close()
-                logger.debug(f"Invalid response: {response.text}")
-                raise APIError(
-                    "Failed to fetch gems. Invalid response data received. Client will try to re-initialize on next request."
-                )
-
-        self._gems = GemJar(
-            itertools.chain(
-                (
-                    (
-                        gem[0],
-                        Gem(
-                            id=gem[0],
-                            name=gem[1][0],
-                            description=gem[1][1],
-                            prompt=gem[2] and gem[2][0] or None,
-                            predefined=True,
-                        ),
-                    )
-                    for gem in predefined_gems
-                ),
-                (
-                    (
-                        gem[0],
-                        Gem(
-                            id=gem[0],
-                            name=gem[1][0],
-                            description=gem[1][1],
-                            prompt=gem[2] and gem[2][0] or None,
-                            predefined=False,
-                        ),
-                    )
-                    for gem in custom_gems
-                ),
-            )
-        )
-
-        return self._gems
-
     @running(retry=2)
     async def generate_content(
         self,
@@ -609,10 +449,21 @@ class GeminiClient:
                         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],
+                                title=(
+                                    f"[Generated Image {generated_image[3][6]}]"
+                                    if generated_image[3][6]
+                                    else "[Generated Image]"
+                                ),
+                                alt=(
+                                    generated_image[3][5][image_index]
+                                    if generated_image[3][5]
+                                    and len(generated_image[3][5]) > image_index
+                                    else (
+                                        generated_image[3][5][0]
+                                        if generated_image[3][5]
+                                        else ""
+                                    )
+                                ),
                                 proxy=self.proxy,
                                 cookies=self.cookies,
                             )
@@ -665,6 +516,53 @@ class GeminiClient:
 
         return ChatSession(geminiclient=self, **kwargs)
 
+    async def _batch_execute(self, payloads: list[RPCData], **kwargs) -> Response:
+        """
+        Execute a batch of requests to Gemini API.
+
+        Parameters
+        ----------
+        payloads: `list[GRPC]`
+            List of `gemini_webapi.types.GRPC` objects to be executed.
+        kwargs: `dict`, optional
+            Additional arguments which will be passed to the post request.
+            Refer to `httpx.AsyncClient.request` for more information.
+
+        Returns
+        -------
+        :class:`httpx.Response`
+            Response object containing the result of the batch execution.
+        """
+
+        try:
+            response = await self.client.post(
+                Endpoint.BATCH_EXEC,
+                data={
+                    "at": self.access_token,
+                    "f.req": json.dumps(
+                        [[payload.serialize() for payload in payloads]]
+                    ).decode(),
+                },
+                **kwargs,
+            )
+        except ReadTimeout:
+            raise TimeoutError(
+                "Batch execute request timed out, please try again. If the problem persists, "
+                "consider setting a higher `timeout` value when initializing GeminiClient."
+            )
+
+        if response.status_code != 200:
+            logger.debug(
+                f"Batch execution failed with status code {response.status_code}. "
+                f"RPC: {', '.join({payload.rpcid.name for payload in payloads})}; "
+                f"Invalid response: {response.text}"
+            )
+            raise APIError(
+                f"Batch execution failed with status code {response.status_code}"
+            )
+
+        return response
+
 
 class ChatSession:
     """

gemini_webapi-1.14.4/src/gemini_webapi/components/__init__.py

@@ -0,0 +1,3 @@
+# flake8: noqa
+
+from .gem_mixin import GemMixin

gemini_webapi-1.14.4/src/gemini_webapi/components/gem_mixin.py

@@ -0,0 +1,151 @@
+import itertools
+
+import orjson as json
+
+from ..constants import GRPC
+from ..exceptions import APIError
+from ..types import Gem, GemJar, RPCData
+from ..utils import running, logger
+
+
+class GemMixin:
+    """
+    Mixin class providing gem-related functionality for GeminiClient.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._gems: GemJar | None = None
+
+    @property
+    def gems(self) -> GemJar:
+        """
+        Returns a `GemJar` object containing cached gems.
+        Only available after calling `GeminiClient.fetch_gems()`.
+
+        Returns
+        -------
+        :class:`GemJar`
+            Refer to `gemini_webapi.types.GemJar`.
+
+        Raises
+        ------
+        `RuntimeError`
+            If `GeminiClient.fetch_gems()` has not been called before accessing this property.
+        """
+
+        if self._gems is None:
+            raise RuntimeError(
+                "Gems not fetched yet. Call `GeminiClient.fetch_gems()` method to fetch gems from gemini.google.com."
+            )
+
+        return self._gems
+
+    @running(retry=2)
+    async def fetch_gems(self, include_hidden: bool = False, **kwargs) -> GemJar:
+        """
+        Get a list of available gems from gemini, including system predefined gems and user-created custom gems.
+
+        Note that network request will be sent every time this method is called.
+        Once the gems are fetched, they will be cached and accessible via `GeminiClient.gems` property.
+
+        Parameters
+        ----------
+        include_hidden: `bool`, optional
+            There are some predefined gems that by default are not shown to users (and therefore may not work properly).
+            Set this parameter to `True` to include them in the fetched gem list.
+
+        Returns
+        -------
+        :class:`GemJar`
+            Refer to `gemini_webapi.types.GemJar`.
+        """
+
+        response = await self._batch_execute(
+            [
+                RPCData(
+                    rpcid=GRPC.LIST_GEMS,
+                    payload="[4]" if include_hidden else "[3]",
+                    identifier="system",
+                ),
+                RPCData(
+                    rpcid=GRPC.LIST_GEMS,
+                    payload="[2]",
+                    identifier="custom",
+                ),
+            ],
+            **kwargs,
+        )
+
+        try:
+            response_json = json.loads(response.text.split("\n")[2])
+
+            predefined_gems, custom_gems = [], []
+
+            for part in response_json:
+                if part[-1] == "system":
+                    predefined_gems = json.loads(part[2])[2]
+                elif part[-1] == "custom":
+                    if custom_gems_container := json.loads(part[2]):
+                        custom_gems = custom_gems_container[2]
+
+            if not predefined_gems and not custom_gems:
+                raise Exception
+        except Exception:
+            await self.close()
+            logger.debug(f"Invalid response: {response.text}")
+            raise APIError(
+                "Failed to fetch gems. Invalid response data received. Client will try to re-initialize on next request."
+            )
+
+        self._gems = GemJar(
+            itertools.chain(
+                (
+                    (
+                        gem[0],
+                        Gem(
+                            id=gem[0],
+                            name=gem[1][0],
+                            description=gem[1][1],
+                            prompt=gem[2] and gem[2][0] or None,
+                            predefined=True,
+                        ),
+                    )
+                    for gem in predefined_gems
+                ),
+                (
+                    (
+                        gem[0],
+                        Gem(
+                            id=gem[0],
+                            name=gem[1][0],
+                            description=gem[1][1],
+                            prompt=gem[2] and gem[2][0] or None,
+                            predefined=False,
+                        ),
+                    )
+                    for gem in custom_gems
+                ),
+            )
+        )
+
+        return self._gems
+
+    @running(retry=2)
+    async def delete_gem(self, gem: Gem | str, **kwargs) -> None:
+        """
+        Delete a custom gem from gemini.google.com.
+
+        Parameters
+        ----------
+        gem: `Gem | str`
+            Gem to delete, can be either a `gemini_webapi.types.Gem` object or a gem id string.
+        """
+
+        if isinstance(gem, Gem):
+            gem = gem.id
+
+        await self._batch_execute(
+            [RPCData(rpcid=GRPC.DELETE_GEM, payload=[gem])],
+            **kwargs,
+        )

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi/constants.py

@@ -10,6 +10,19 @@ class Endpoint(StrEnum):
     BATCH_EXEC = "https://gemini.google.com/_/BardChatUi/data/batchexecute"
 
 
+class GRPC(StrEnum):
+    """
+    Google RPC ids used in Gemini API.
+    """
+
+    # Chat methods
+    READ_CHAT = "hNvQHb"
+
+    # Gem methods
+    LIST_GEMS = "CNgdBe"
+    DELETE_GEM = "UXcSJb"
+
+
 class Headers(Enum):
     GEMINI = {
         "Content-Type": "application/x-www-form-urlencoded;charset=utf-8",

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi/types/__init__.py

@@ -2,5 +2,6 @@
 
 from .candidate import Candidate
 from .gem import Gem, GemJar
+from .grpc import RPCData
 from .image import Image, WebImage, GeneratedImage
 from .modeloutput import ModelOutput

gemini_webapi-1.14.4/src/gemini_webapi/types/grpc.py

@@ -0,0 +1,34 @@
+from pydantic import BaseModel
+
+from ..constants import GRPC
+
+
+class RPCData(BaseModel):
+    """
+    Helper class containing necessary data for Google RPC calls.
+
+    Parameters
+    ----------
+    rpcid : GRPC
+        Google RPC ID.
+    payload : str
+        Payload for the RPC call.
+    identifier : str, optional
+        Identifier/order for the RPC call, defaults to "generic".
+        Makes sense if there are multiple RPC calls in a batch, where this identifier
+        can be used to distinguish between responses.
+    """
+
+    rpcid: GRPC
+    payload: str
+    identifier: str = "generic"
+
+    def __repr__(self):
+        return f"GRPC(rpcid='{self.rpcid}', payload='{self.payload}', identifier='{self.identifier}')"
+
+    def serialize(self) -> list:
+        """
+        Serializes object into formatted payload ready for RPC call.
+        """
+
+        return [self.rpcid, self.payload, None, self.identifier]

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi/types/image.py

@@ -30,10 +30,10 @@ class Image(BaseModel):
     proxy: str | None = None
 
     def __str__(self):
-        return f"{self.title}({self.url}) - {self.alt}"
-
-    def __repr__(self):
-        return f"Image(title='{self.title}', url='{len(self.url) <= 20 and self.url or self.url[:8] + '...' + self.url[-12:]}', alt='{self.alt}')"
+        return (
+            f"Image(title='{self.title}', alt='{self.alt}', "
+            f"url='{len(self.url) <= 20 and self.url or self.url[:8] + '...' + self.url[-12:]}')"
+        )
 
     async def save(
         self,

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi/utils/__init__.py

@@ -2,6 +2,7 @@
 
 from asyncio import Task
 
+from .decorators import running
 from .upload_file import upload_file, parse_file_name
 from .rotate_1psidts import rotate_1psidts
 from .get_access_token import get_access_token

gemini_webapi-1.14.4/src/gemini_webapi/utils/decorators.py

@@ -0,0 +1,52 @@
+import asyncio
+import functools
+
+from ..exceptions import APIError, ImageGenerationError
+
+
+def running(retry: int = 0) -> callable:
+    """
+    Decorator to check if GeminiClient is running before making a request.
+
+    Parameters
+    ----------
+    retry: `int`, optional
+        Max number of retries when `gemini_webapi.APIError` is raised.
+    """
+
+    def decorator(func):
+        @functools.wraps(func)
+        async def wrapper(client, *args, retry=retry, **kwargs):
+            try:
+                if not client.running:
+                    await client.init(
+                        timeout=client.timeout,
+                        auto_close=client.auto_close,
+                        close_delay=client.close_delay,
+                        auto_refresh=client.auto_refresh,
+                        refresh_interval=client.refresh_interval,
+                        verbose=False,
+                    )
+                    if client.running:
+                        return await func(client, *args, **kwargs)
+
+                    # Should not reach here
+                    raise APIError(
+                        f"Invalid function call: GeminiClient.{func.__name__}. Client initialization failed."
+                    )
+                else:
+                    return await func(client, *args, **kwargs)
+            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
+
+    return decorator

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-webapi
-Version: 1.14.2
+Version: 1.14.4
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -678,7 +678,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx[http2]~=0.28.1
 Requires-Dist: loguru~=0.7.3
-Requires-Dist: orjson~=3.10.18
+Requires-Dist: orjson~=3.11.1
 Requires-Dist: pydantic~=2.11.5
 Dynamic: license-file
 
@@ -931,10 +931,14 @@ asyncio.run(main())
 
 System prompt can be applied to conversations via [Gemini Gems](https://gemini.google.com/gems/view). To use a gem, you can pass `gem` argument to `GeminiClient.generate_content` or `GeminiClient.start_chat`. `gem` can be either a string of gem id or a `gemini_webapi.Gem` object. Only one gem can be applied to a single conversation.
 
+> [!TIP]
+>
+> There are some system predefined gems that by default are not shown to users (and therefore may not work properly). Use `client.fetch_gems(include_hidden=True)` to include them in the fetch result.
+
 ```python
 async def main():
     # Fetch all gems for the current account, including both predefined and user-created ones
-    await client.fetch_gems()
+    await client.fetch_gems(include_hidden=False)
 
     # Once fetched, gems will be cached in `GeminiClient.gems`
     gems = client.gems

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi.egg-info/SOURCES.txt

@@ -20,17 +20,21 @@ src/gemini_webapi.egg-info/SOURCES.txt
 src/gemini_webapi.egg-info/dependency_links.txt
 src/gemini_webapi.egg-info/requires.txt
 src/gemini_webapi.egg-info/top_level.txt
+src/gemini_webapi/components/__init__.py
+src/gemini_webapi/components/gem_mixin.py
 src/gemini_webapi/types/__init__.py
 src/gemini_webapi/types/candidate.py
 src/gemini_webapi/types/gem.py
+src/gemini_webapi/types/grpc.py
 src/gemini_webapi/types/image.py
 src/gemini_webapi/types/modeloutput.py
 src/gemini_webapi/utils/__init__.py
+src/gemini_webapi/utils/decorators.py
 src/gemini_webapi/utils/get_access_token.py
 src/gemini_webapi/utils/load_browser_cookies.py
 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_rotate_cookies.py
+tests/test_gem_mixin.py
 tests/test_save_image.py

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/src/gemini_webapi.egg-info/requires.txt

@@ -1,4 +1,4 @@
 httpx[http2]~=0.28.1
 loguru~=0.7.3
-orjson~=3.10.18
+orjson~=3.11.1
 pydantic~=2.11.5

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/tests/test_client_features.py

@@ -72,7 +72,6 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
         self.assertTrue(response.images)
         logger.debug(response.text)
         for image in response.images:
-            self.assertTrue(image.url)
             logger.debug(image)
 
     @logger.catch(reraise=True)
@@ -83,7 +82,17 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
         self.assertTrue(response.images)
         logger.debug(response.text)
         for image in response.images:
-            self.assertTrue(image.url)
+            logger.debug(image)
+
+    @logger.catch(reraise=True)
+    async def test_image_to_image(self):
+        response = await self.geminiclient.generate_content(
+            "Design an application icon based on the provided image. Make it simple and modern.",
+            files=["assets/banner.png"],
+        )
+        self.assertTrue(response.images)
+        logger.debug(response.text)
+        for image in response.images:
             logger.debug(image)
 
     @logger.catch(reraise=True)
@@ -95,14 +104,6 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
         )
         logger.debug(response.text)
 
-    @logger.catch(reraise=True)
-    async def test_fetch_gems(self):
-        await self.geminiclient.fetch_gems()
-        gems = self.geminiclient.gems
-        self.assertTrue(len(gems.filter(predefined=True)) > 0)
-        for gem in gems:
-            logger.debug(gem.name)
-
     @logger.catch(reraise=True)
     async def test_thinking_model(self):
         response = await self.geminiclient.generate_content(

gemini_webapi-1.14.4/tests/test_gem_mixin.py

@@ -0,0 +1,33 @@
+import os
+import unittest
+import logging
+
+from gemini_webapi import GeminiClient, set_log_level, logger
+from gemini_webapi.exceptions import AuthError
+
+logging.getLogger("asyncio").setLevel(logging.ERROR)
+set_log_level("DEBUG")
+
+
+class TestGemMixin(unittest.IsolatedAsyncioTestCase):
+    async def asyncSetUp(self):
+        self.geminiclient = GeminiClient(
+            os.getenv("SECURE_1PSID"), os.getenv("SECURE_1PSIDTS"), verify=False
+        )
+
+        try:
+            await self.geminiclient.init(timeout=60, auto_refresh=False)
+        except AuthError as e:
+            self.skipTest(e)
+
+    @logger.catch(reraise=True)
+    async def test_fetch_gems(self):
+        await self.geminiclient.fetch_gems(include_hidden=True)
+        gems = self.geminiclient.gems
+        self.assertTrue(len(gems.filter(predefined=True)) > 0)
+        for gem in gems:
+            logger.debug(gem.name)
+
+
+if __name__ == "__main__":
+    unittest.main()

{gemini_webapi-1.14.2 → gemini_webapi-1.14.4}/tests/test_save_image.py

@@ -26,8 +26,7 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
             "Show me some pictures of random subjects"
         )
         self.assertTrue(response.images)
-        for i, image in enumerate(response.images):
-            self.assertTrue(image.url)
+        for image in response.images:
             try:
                 await image.save(verbose=True, skip_invalid_filename=True)
             except HTTPError as e:
@@ -38,8 +37,16 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
             "Generate a picture of random subjects"
         )
         self.assertTrue(response.images)
-        for i, image in enumerate(response.images):
-            self.assertTrue(image.url)
+        for image in response.images:
+            await image.save(verbose=True, full_size=True)
+
+    async def test_save_image_to_image(self):
+        response = await self.geminiclient.generate_content(
+            "Design an application icon based on the provided image. Make it simple and modern.",
+            files=["assets/banner.png"],
+        )
+        self.assertTrue(response.images)
+        for image in response.images:
             await image.save(verbose=True, full_size=True)
 
 

gemini_webapi-1.14.2/tests/test_rotate_cookies.py

@@ -1,24 +0,0 @@
-import os
-import asyncio
-
-from gemini_webapi import GeminiClient, set_log_level, logger
-
-set_log_level("DEBUG")
-
-
-@logger.catch()
-async def main():
-    client = GeminiClient(os.getenv("SECURE_1PSID"), os.getenv("SECURE_1PSIDTS"))
-    await client.init(close_delay=30, refresh_interval=60)
-
-    while True:
-        try:
-            response = await client.generate_content("Hello world")
-            logger.info(response)
-        except Exception as e:
-            logger.error(e)
-        await asyncio.sleep(60)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())