anti-cf 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

anti_cf/_persistent_session.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, ClassVar
 
 import fake_useragent
 from logprise import logger
+from requests import HTTPError
 
 from ._constants import CACHE_PATH, DEFAULT_TIMEOUT, FLARESOLVERR_PROXY
 from ._flaresolverr import ensure_flaresolverr_running, get_flaresolverr_settings
@@ -16,7 +17,7 @@ try:
     _HAS_CACHE = True
     logger.info("Using CachedSession for persistent session")
 except ImportError:
-    from requests import HTTPError, Session
+    from requests import Session
 
     _HAS_CACHE = False
 
@@ -46,10 +47,11 @@ class PersistentSession(Session):
             super().__init__()
 
         self._load_cookies()
-        ensure_flaresolverr_running()
         self.set_user_agent()
+        self._flaresolverr_initialized = False
 
     def _get_user_agent(self) -> str:
+        # Try FlareSolverr first, but don't start it if not running
         flaresolverr_settings = get_flaresolverr_settings()
         if flaresolverr_settings is not None:
             return flaresolverr_settings["userAgent"]
@@ -86,6 +88,12 @@ class PersistentSession(Session):
         self.save_cookies()
         return response
 
+    def _ensure_flaresolverr_initialized(self) -> None:
+        """Ensure FlareSolverr is ready when needed."""
+        if not self._flaresolverr_initialized:
+            ensure_flaresolverr_running()
+            self._flaresolverr_initialized = True
+
     def get(self, url: str | bytes, *, try_with_cloudflare: bool = False, _cloudflare_counter: int = 0, **kwargs: object) -> Response | None:
         if not try_with_cloudflare or "cf_clearance" in self.cookies:
             try:
@@ -106,10 +114,10 @@ class PersistentSession(Session):
                 else:
                     logger.warning("Cloudflare detected, but `try_with_cloudflare` wasn't set to True!")
 
+        self._ensure_flaresolverr_initialized()
+
         try:
             self._get_url_via_flaresolverr(url)
-            # After the url is retrieved from the flaresolverr proxy, it's not necessarily the one we want
-            #  --> So we'll re-request it here:
             return super().get(url, **kwargs)
         except Exception:
             logger.error("FlareSolverr didn't solve it :(")
@@ -128,8 +136,8 @@ class PersistentSession(Session):
         dta = response.json()
         for cookie in dta["solution"]["cookies"]:
             self.cookies.set(
-                name=cookie["name"],  # required
-                value=cookie["value"],  # required
+                name=cookie["name"],
+                value=cookie["value"],
                 version=cookie.get("version", 0),
                 port=cookie.get("port", None),
                 domain=cookie.get("domain", ""),

{anti_cf-1.0.1.dist-info → anti_cf-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: anti_cf
-Version: 1.0.1
+Version: 1.1.0
 Summary: Anti-CloudFlare package
 License: MIT
 Author: Steven Van Ingelgem

anti_cf-1.1.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+anti_cf/__init__.py,sha256=ZFXXzfWeiBqKC56vdyod1yXj5_Kg4NXJeTejs2WoEEU,71
+anti_cf/_constants.py,sha256=xFIXkeBVkuHsTQKQU4p2leJkySHdJ_6xApgIoVrBWHA,262
+anti_cf/_flaresolverr.py,sha256=vOuut3fH1CstumQrNyIhm7B58ybLCSPUaK5NDTiQwj8,1633
+anti_cf/_persistent_session.py,sha256=UqDLEMrZ4ybJGWySn2AIDOlSCz43kzx14hlZNsuzjU4,5853
+anti_cf-1.1.0.dist-info/METADATA,sha256=vmHncM9A664cySSKGwQ4aK9m_SqSZnw8GJFIvSnx9pM,3187
+anti_cf-1.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+anti_cf-1.1.0.dist-info/RECORD,,

{anti_cf-1.0.1.dist-info → anti_cf-1.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

anti_cf-1.0.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-anti_cf/__init__.py,sha256=ZFXXzfWeiBqKC56vdyod1yXj5_Kg4NXJeTejs2WoEEU,71
-anti_cf/_constants.py,sha256=xFIXkeBVkuHsTQKQU4p2leJkySHdJ_6xApgIoVrBWHA,262
-anti_cf/_flaresolverr.py,sha256=vOuut3fH1CstumQrNyIhm7B58ybLCSPUaK5NDTiQwj8,1633
-anti_cf/_persistent_session.py,sha256=exxEpwqfRXonezFh3BEu4JclZ1lTGShM4l0fSlOIeeI,5634
-anti_cf-1.0.1.dist-info/METADATA,sha256=9exeaEIAuWMlnuLceXcoo8A9dftwHKDh6NLZ5UIWZgk,3187
-anti_cf-1.0.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-anti_cf-1.0.1.dist-info/RECORD,,