gemini-webapi 1.6.1__py3-none-any.whl → 1.7.0__py3-none-any.whl

gemini_webapi/client.py

@@ -77,8 +77,8 @@ class GeminiClient:
         __Secure-1PSID cookie value.
     secure_1psidts: `str`, optional
         __Secure-1PSIDTS cookie value, some google accounts don't require this value, provide only if it's in the cookie list.
-    proxies: `dict`, optional
-        Dict of proxies.
+    proxy: `str`, optional
+        Proxy URL.
 
     Raises
     ------
@@ -88,7 +88,7 @@ class GeminiClient:
 
     __slots__ = [
         "cookies",
-        "proxies",
+        "proxy",
         "running",
         "client",
         "access_token",
@@ -104,10 +104,10 @@ class GeminiClient:
         self,
         secure_1psid: str | None = None,
         secure_1psidts: str | None = None,
-        proxies: dict | None = None,
+        proxy: str | None = None,
     ):
         self.cookies = {}
-        self.proxies = proxies
+        self.proxy = proxy
         self.running: bool = False
         self.client: AsyncClient | None = None
         self.access_token: str | None = None
@@ -164,12 +164,12 @@ class GeminiClient:
 
         try:
             access_token, valid_cookies = await get_access_token(
-                base_cookies=self.cookies, proxies=self.proxies, verbose=verbose
+                base_cookies=self.cookies, proxy=self.proxy, verbose=verbose
             )
 
             self.client = AsyncClient(
                 timeout=timeout,
-                proxies=self.proxies,
+                proxy=self.proxy,
                 follow_redirects=True,
                 headers=Headers.GEMINI.value,
                 cookies=valid_cookies,
@@ -238,7 +238,7 @@ class GeminiClient:
 
         while True:
             try:
-                new_1psidts = await rotate_1psidts(self.cookies, self.proxies)
+                new_1psidts = await rotate_1psidts(self.cookies, self.proxy)
             except AuthError:
                 if task := rotate_tasks.get(self.cookies["__Secure-1PSID"]):
                     task.cancel()
@@ -313,7 +313,7 @@ class GeminiClient:
                                             [
                                                 [
                                                     await upload_file(
-                                                        image, self.proxies
+                                                        image, self.proxy
                                                     ),
                                                     1,
                                                 ]
@@ -377,7 +377,7 @@ class GeminiClient:
                                 url=image[0][0][0],
                                 title=image[7][0],
                                 alt=image[0][4],
-                                proxies=self.proxies,
+                                proxy=self.proxy,
                             )
                             for image in candidate[12][1]
                         ]
@@ -395,7 +395,7 @@ class GeminiClient:
                                 alt=len(image[3][5]) > i
                                 and image[3][5][i]
                                 or image[3][5][0],
-                                proxies=self.proxies,
+                                proxy=self.proxy,
                                 cookies=self.cookies,
                             )
                             for i, image in enumerate(

gemini_webapi/types/image.py

@@ -20,14 +20,14 @@ class Image(BaseModel):
         Title of the image, by default is "[Image]".
     alt: `str`, optional
         Optional description of the image.
-    proxies: `dict`, optional
-        Dict of proxies used when saving image.
+    proxy: `str`, optional
+        Proxy used when saving image.
     """
 
     url: str
     title: str = "[Image]"
     alt: str = ""
-    proxies: dict | None = None
+    proxy: str | None = None
 
     def __str__(self):
         return f"{self.title}({self.url}) - {self.alt}"
@@ -80,7 +80,7 @@ class Image(BaseModel):
                 return None
 
         async with AsyncClient(
-            follow_redirects=True, cookies=cookies, proxies=self.proxies
+            follow_redirects=True, cookies=cookies, proxy=self.proxy
         ) as client:
             response = await client.get(self.url)
             if response.status_code == 200:

gemini_webapi/utils/get_access_token.py

@@ -12,7 +12,7 @@ from .logger import logger
 
 
 async def get_access_token(
-    base_cookies: dict, proxies: dict | None = None, verbose: bool = False
+    base_cookies: dict, proxy: str | None = None, verbose: bool = False
 ) -> tuple[str, dict]:
     """
     Send a get request to gemini.google.com for each group of available cookies and return
@@ -27,8 +27,8 @@ async def get_access_token(
     ----------
     base_cookies : `dict`
         Base cookies to be used in the request.
-    proxies: `dict`, optional
-        Dict of proxies.
+    proxy: `str`, optional
+        Proxy URL.
     verbose: `bool`, optional
         If `True`, will print more infomation in logs.
 
@@ -47,7 +47,7 @@ async def get_access_token(
 
     async def send_request(cookies: dict) -> tuple[Response | None, dict]:
         async with AsyncClient(
-            proxies=proxies,
+            proxy=proxy,
             headers=Headers.GEMINI.value,
             cookies=cookies,
             follow_redirects=True,

gemini_webapi/utils/rotate_1psidts.py

@@ -8,7 +8,7 @@ from ..constants import Endpoint, Headers
 from ..exceptions import AuthError
 
 
-async def rotate_1psidts(cookies: dict, proxies: dict | None = None) -> str:
+async def rotate_1psidts(cookies: dict, proxy: str | None = None) -> str:
     """
     Refresh the __Secure-1PSIDTS cookie and store the refreshed cookie value in cache file.
 
@@ -16,8 +16,8 @@ async def rotate_1psidts(cookies: dict, proxies: dict | None = None) -> str:
     ----------
     cookies : `dict`
         Cookies to be used in the request.
-    proxies: `dict`, optional
-        Dict of proxies.
+    proxy: `str`, optional
+        Proxy URL.
 
     Returns
     -------
@@ -39,7 +39,7 @@ async def rotate_1psidts(cookies: dict, proxies: dict | 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(proxies=proxies) 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

@@ -7,7 +7,7 @@ from ..constants import Endpoint, Headers
 
 
 @validate_call
-async def upload_file(file: bytes | str | Path, proxies: dict | None = None) -> str:
+async def upload_file(file: bytes | str | Path, proxy: str | None = None) -> str:
     """
     Upload a file to Google's server and return its identifier.
 
@@ -15,8 +15,8 @@ async def upload_file(file: bytes | str | Path, proxies: dict | None = None) ->
     ----------
     file : `bytes` | `str` | `Path`
         File data in bytes, or path to the file to be uploaded.
-    proxies: `dict`, optional
-        Dict of proxies.
+    proxy: `str`, optional
+        Proxy URL.
 
     Returns
     -------
@@ -34,7 +34,7 @@ async def upload_file(file: bytes | str | Path, proxies: dict | None = None) ->
         with open(file, "rb") as f:
             file = f.read()
 
-    async with AsyncClient(proxies=proxies) as client:
+    async with AsyncClient(proxy=proxy) as client:
         response = await client.post(
             url=Endpoint.UPLOAD.value,
             headers=Headers.UPLOAD.value,

{gemini_webapi-1.6.1.dist-info → gemini_webapi-1.7.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: gemini-webapi
-Version: 1.6.1
+Version: 1.7.0
 Summary: ✨ An elegant async Python wrapper for Google Gemini web app
 Author: UZQueen
-License: GNU AFFERO GENERAL PUBLIC LICENSE
+License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
          Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
@@ -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.25.2
-Requires-Dist: pydantic >=2.5.3
-Requires-Dist: loguru >=0.7.2
+Requires-Dist: httpx~=0.28.0
+Requires-Dist: pydantic~=2.10.2
+Requires-Dist: loguru~=0.7.2
 
 <p align="center">
     <img src="https://raw.githubusercontent.com/HanaokaYuzu/Gemini-API/master/assets/banner.png" width="55%" alt="Gemini Banner" align="center">
@@ -804,7 +804,7 @@ Secure_1PSIDTS = "COOKIE VALUE HERE"
 
 async def main():
     # If browser-cookie3 is installed, simply use `client = GeminiClient()`
-    client = GeminiClient(Secure_1PSID, Secure_1PSIDTS, proxies=None)
+    client = GeminiClient(Secure_1PSID, Secure_1PSIDTS, proxy=None)
     await client.init(timeout=30, auto_close=False, close_delay=300, auto_refresh=True)
 
 asyncio.run(main())

{gemini_webapi-1.6.1.dist-info → gemini_webapi-1.7.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
 gemini_webapi/__init__.py,sha256=28uNIywK4vCXxENaSagNWUzhqr1RyNtLzDF6WRRM4KQ,194
-gemini_webapi/client.py,sha256=q99zlCYr97ThzaMYgczICOub0WUqxzQ2JN4VFv2PzSw,20960
+gemini_webapi/client.py,sha256=A_unTPUCSSLch0zojvTG4PrS7Hvpxgr7mnIXG-uW_kM,20922
 gemini_webapi/constants.py,sha256=ezJ0Squ5FPTspAp5IGRe5gg9CYaPHnzx5N95W5gGm5s,865
 gemini_webapi/exceptions.py,sha256=6e-EXHGApi4iC0GDw7RKc3YqVK8UvEkHYaJyGQbReLw,548
 gemini_webapi/types/__init__.py,sha256=d2kvXnE004s2E2KDmPPLi5N-BQ59FgDSlrGrO3Wphww,163
 gemini_webapi/types/candidate.py,sha256=Z9bpIK4l8UWbUVMLEoophfhgROo93dxOM9cAwx77CkU,1030
-gemini_webapi/types/image.py,sha256=UrLG1NiiXax6w79ES88vykG5mipGKHI9-9R7QcG768Q,5245
+gemini_webapi/types/image.py,sha256=9l4_k4C3RPFOgGIVnPnTAKYmUISdvdx_LwvcJYJNLuo,5225
 gemini_webapi/types/modeloutput.py,sha256=sGEnaQtSOJE68ve5R5sFgW4POmsyWZAV5zei3Z4BRVk,1090
 gemini_webapi/utils/__init__.py,sha256=mcm1kgQ5HHKyZrhHS-rd_GXbKMpIDUsq02XtmlQNN_I,357
-gemini_webapi/utils/get_access_token.py,sha256=ssMccXzqSAgSzpezaRu1w7LiO9tRIroiSXWru_X9g3c,5457
+gemini_webapi/utils/get_access_token.py,sha256=h0gcCCQZzVStE4sgUS_jjMVGYQT_20LK2HX5jcIriWs,5441
 gemini_webapi/utils/load_browser_cookies.py,sha256=A5n_VsB7Rm8ck5lpy856UNJEhv30l3dvQ3j0g3ln1fE,1535
 gemini_webapi/utils/logger.py,sha256=PF4ROQq7scRRrWzeYdeYiYs2S2Jqr0bgjyrPbXVOCqE,816
-gemini_webapi/utils/rotate_1psidts.py,sha256=HY_rOpO13J34uQwRmARQ9rM0eKRSIzYM6Sk0j8noWVU,1684
-gemini_webapi/utils/upload_file.py,sha256=RsttsLLFyw3HJLjEaXcy9aY6DmKEhJt02_iK5gPMKOY,1167
-gemini_webapi-1.6.1.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-gemini_webapi-1.6.1.dist-info/METADATA,sha256=6iFMi7oDeVNa2pFtLV2U3QluF8JRzMvX7ccsg367ELI,55713
-gemini_webapi-1.6.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-gemini_webapi-1.6.1.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
-gemini_webapi-1.6.1.dist-info/RECORD,,
+gemini_webapi/utils/rotate_1psidts.py,sha256=cwCXsE_mX2knaKCuquZT2jsRXHQo-GK2Ldom-cO9Gio,1668
+gemini_webapi/utils/upload_file.py,sha256=X0k-3jW7usheFo5z0nXL9mUt-XF-2L2OgwpJnPSIcKw,1151
+gemini_webapi-1.7.0.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gemini_webapi-1.7.0.dist-info/METADATA,sha256=XhfeQVH9p_5SYZ1t12mVhrhbIJMCw9Ucqhmzq0PvKI0,55729
+gemini_webapi-1.7.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gemini_webapi-1.7.0.dist-info/top_level.txt,sha256=dtWtug_ZrmnUqCYuu8NmGzTgWglHeNzhHU_hXmqZGWE,14
+gemini_webapi-1.7.0.dist-info/RECORD,,

{gemini_webapi-1.6.1.dist-info → gemini_webapi-1.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any