gemini-webapi 1.8.0__tar.gz → 1.8.2__tar.gz

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/.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.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: dist
           path: dist

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gemini-webapi
-Version: 1.8.0
+Version: 1.8.2
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -944,9 +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)**
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/README.md

@@ -262,9 +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)**
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/src/gemini_webapi/client.py

@@ -381,7 +381,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 +404,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.0 → gemini_webapi-1.8.2}/src/gemini_webapi/constants.py

@@ -24,19 +24,37 @@ class Headers(Enum):
 
 
 class Model(Enum):
-    UNSPECIFIED = ("unspecified", {})
+    UNSPECIFIED = ("unspecified", {}, False)
     G_1_5_FLASH = (
         "gemini-1.5-flash",
         {"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"]'},
+        False,
+    )
+    G_2_0_EXP_ADVANCED = (
+        "gemini-2.0-exp-advanced",
+        {"x-goog-ext-525001261-jspb": '[null,null,null,null,"b1e46a6037e6aa9f"]'},
+        True,
     )
 
-    def __init__(self, name, header):
+    def __init__(self, name, header, advanced_only):
         self.model_name = name
         self.model_header = header
+        self.advanced_only = advanced_only
 
     @classmethod
     def from_name(cls, name: str):

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/src/gemini_webapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gemini-webapi
-Version: 1.8.0
+Version: 1.8.2
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -944,9 +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)**
 
 ```python
 from gemini_webapi.constants import Model

{gemini_webapi-1.8.0 → gemini_webapi-1.8.2}/tests/test_client_features.py

@@ -31,6 +31,10 @@ class TestGeminiClient(unittest.IsolatedAsyncioTestCase):
     @logger.catch(reraise=True)
     async def test_switch_model(self):
         for model in Model:
+            if model.advanced_only:
+                logger.debug(f"Model {model.model_name} requires an advanced account")
+                continue
+
             response = await self.geminiclient.generate_content(
                 "What's you language model version? Reply version number only.",
                 model=model,
@@ -81,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?")