gemini-webapi 1.8.1__tar.gz → 1.8.3__tar.gz

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/.github/workflows/pypi-publish.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Build package
         run: python -m build
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v4.5.0
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: dist
           path: dist

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gemini-webapi
-Version: 1.8.1
+Version: 1.8.3
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,9 +676,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx~=0.28.0
-Requires-Dist: pydantic~=2.10.2
-Requires-Dist: loguru~=0.7.2
+Requires-Dist: httpx[http2]~=0.28.1
+Requires-Dist: pydantic~=2.10.5
+Requires-Dist: loguru~=0.7.3
 
 <p align="center">
     <img src="https://raw.githubusercontent.com/HanaokaYuzu/Gemini-API/master/assets/banner.png" width="55%" alt="Gemini Banner" align="center">
@@ -944,10 +944,12 @@ You can choose a specified language model version by passing `model` argument to
 
 Currently available models (as of Dec 21, 2024):
 
-- `unspecified` - Default model (Gemini 1.5 Flash)
+- `unspecified` - Default model (Gemini 1.5 Pro if account has Gemini Advanced subscription, otherwise Gemini 1.5 Flash)
 - `gemini-1.5-flash` - Gemini 1.5 Flash
+- `gemini-1.5-pro` - Gemini 1.5 Pro **(requires Gemini Advanced account)**
+- `gemini-1.5-pro-research` - Gemini 1.5 Pro with Deep Research **(requires Gemini Advanced account)**
 - `gemini-2.0-flash-exp` - Gemini 2.0 Flash Experimental
-- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced (requires Gemini Advanced account)
+- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced **(requires Gemini Advanced account)**
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/README.md

@@ -262,10 +262,12 @@ You can choose a specified language model version by passing `model` argument to
 
 Currently available models (as of Dec 21, 2024):
 
-- `unspecified` - Default model (Gemini 1.5 Flash)
+- `unspecified` - Default model (Gemini 1.5 Pro if account has Gemini Advanced subscription, otherwise Gemini 1.5 Flash)
 - `gemini-1.5-flash` - Gemini 1.5 Flash
+- `gemini-1.5-pro` - Gemini 1.5 Pro **(requires Gemini Advanced account)**
+- `gemini-1.5-pro-research` - Gemini 1.5 Pro with Deep Research **(requires Gemini Advanced account)**
 - `gemini-2.0-flash-exp` - Gemini 2.0 Flash Experimental
-- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced (requires Gemini Advanced account)
+- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced **(requires Gemini Advanced account)**
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/pyproject.toml

@@ -20,9 +20,9 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "httpx~=0.28.0",
-    "pydantic~=2.10.2",
-    "loguru~=0.7.2",
+    "httpx[http2]~=0.28.1",
+    "pydantic~=2.10.5",
+    "loguru~=0.7.3",
 ]
 dynamic = ["version"]
 

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/client.py

@@ -174,6 +174,7 @@ class GeminiClient:
             )
 
             self.client = AsyncClient(
+                http2=True,
                 timeout=timeout,
                 proxy=self.proxy,
                 follow_redirects=True,
@@ -381,7 +382,7 @@ class GeminiClient:
                 for i, candidate in enumerate(body[4]):
                     text = candidate[1][0]
                     if re.match(
-                        r"^http://googleusercontent.com/card_content/\d+$", text
+                        r"^http://googleusercontent\.com/card_content/\d+$", text
                     ):
                         text = candidate[22] and candidate[22][0] or text
 
@@ -404,20 +405,31 @@ class GeminiClient:
                     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]
-                        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]
-                            )
-                        ] or []
+                        text = re.sub(
+                            r"http://googleusercontent\.com/image_generation_content/\d+$",
+                            "",
+                            image_generation_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]
+                                )
+                            ]
 
                     candidates.append(
                         Candidate(

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/constants.py

@@ -30,6 +30,16 @@ class Model(Enum):
         {"x-goog-ext-525001261-jspb": '[null,null,null,null,"7daceb7ef88130f5"]'},
         False,
     )
+    G_1_5_PRO = (
+        "gemini-1.5-pro",
+        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"9d60dfae93c9ff1f"]'},
+        True,
+    )
+    G_1_5_PRO_RESEARCH = (
+        "gemini-1.5-pro-research",
+        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"e5a44cb1dae2b489"]'},
+        True,
+    )
     G_2_0_FLASH_EXP = (
         "gemini-2.0-flash-exp",
         {"x-goog-ext-525001261-jspb": '[null,null,null,null,"948b866104ccf484"]'},

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/types/image.py

@@ -80,7 +80,7 @@ class Image(BaseModel):
                 return None
 
         async with AsyncClient(
-            follow_redirects=True, cookies=cookies, proxy=self.proxy
+            http2=True, follow_redirects=True, cookies=cookies, proxy=self.proxy
         ) as client:
             response = await client.get(self.url)
             if response.status_code == 200:

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/utils/get_access_token.py

@@ -47,6 +47,7 @@ async def get_access_token(
 
     async def send_request(cookies: dict) -> tuple[Response | None, dict]:
         async with AsyncClient(
+            http2=True,
             proxy=proxy,
             headers=Headers.GEMINI.value,
             cookies=cookies,

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/utils/rotate_1psidts.py

@@ -39,7 +39,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(proxy=proxy) as client:
+        async with AsyncClient(http2=True, proxy=proxy) as client:
             response = await client.post(
                 url=Endpoint.ROTATE_COOKIES.value,
                 headers=Headers.ROTATE_COOKIES.value,

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi/utils/upload_file.py

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

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/src/gemini_webapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gemini-webapi
-Version: 1.8.1
+Version: 1.8.3
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,9 +676,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx~=0.28.0
-Requires-Dist: pydantic~=2.10.2
-Requires-Dist: loguru~=0.7.2
+Requires-Dist: httpx[http2]~=0.28.1
+Requires-Dist: pydantic~=2.10.5
+Requires-Dist: loguru~=0.7.3
 
 <p align="center">
     <img src="https://raw.githubusercontent.com/HanaokaYuzu/Gemini-API/master/assets/banner.png" width="55%" alt="Gemini Banner" align="center">
@@ -944,10 +944,12 @@ You can choose a specified language model version by passing `model` argument to
 
 Currently available models (as of Dec 21, 2024):
 
-- `unspecified` - Default model (Gemini 1.5 Flash)
+- `unspecified` - Default model (Gemini 1.5 Pro if account has Gemini Advanced subscription, otherwise Gemini 1.5 Flash)
 - `gemini-1.5-flash` - Gemini 1.5 Flash
+- `gemini-1.5-pro` - Gemini 1.5 Pro **(requires Gemini Advanced account)**
+- `gemini-1.5-pro-research` - Gemini 1.5 Pro with Deep Research **(requires Gemini Advanced account)**
 - `gemini-2.0-flash-exp` - Gemini 2.0 Flash Experimental
-- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced (requires Gemini Advanced account)
+- `gemini-2.0-exp-advanced` - Gemini 2.0 Experimental Advanced **(requires Gemini Advanced account)**
 
 ```python
 from gemini_webapi.constants import Model

gemini_webapi-1.8.3/src/gemini_webapi.egg-info/requires.txt

@@ -0,0 +1,3 @@
+httpx[http2]~=0.28.1
+pydantic~=2.10.5
+loguru~=0.7.3

{gemini_webapi-1.8.1 → gemini_webapi-1.8.3}/tests/test_client_features.py

@@ -85,20 +85,30 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
             "Send me some pictures of cats"
         )
         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_ai_image_generation(self):
+    async def test_image_generation(self):
         response = await self.geminiclient.generate_content(
             "Generate some pictures of cats"
         )
         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_generation_failure(self):
+        response = await self.geminiclient.generate_content(
+            "Generate some pictures of people"
+        )
+        self.assertFalse(response.images)
+        logger.debug(response.text)
+
     @logger.catch(reraise=True)
     async def test_card_content(self):
         response = await self.geminiclient.generate_content("How is today's weather?")

gemini_webapi-1.8.1/src/gemini_webapi.egg-info/requires.txt

@@ -1,3 +0,0 @@
-httpx~=0.28.0
-pydantic~=2.10.2
-loguru~=0.7.2