eaf-base-api 2.4.4__tar.gz → 2.4.6__tar.gz

{eaf_base_api-2.4.4/eaf_base_api.egg-info → eaf_base_api-2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.4.4
+Version: 2.4.6
 Summary: A base API for EchterAlsFake's Porn APIs
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
 License: LGPLv3

{eaf_base_api-2.4.4 → eaf_base_api-2.4.6}/base_api/base.py

@@ -658,8 +658,8 @@ class BaseCore:
     def initialize_session(self):
         limits = httpx.Limits(
             max_connections=getattr(self.config, "max_connections", 128),
-            max_keepalive_connections=getattr(self.config, "max_keepalive", 32),
-            keepalive_expiry=60.0,
+            max_keepalive_connections=getattr(self.config, "max_keepalive", 4),
+            keepalive_expiry=10,
         )
         ctx = ssl.create_default_context()
         if not self.config.verify_ssl:
@@ -870,6 +870,12 @@ class BaseCore:
 
                 # 429: rate limited — respect Retry-After if present, else backoff and retry up to cap
                 if status == 429:
+                    if attempt == 0 or attempt == 1:
+                        self.logger.info("Trying 429 bypass (Initializing new session...)")
+                        del self.session
+                        self.initialize_session()
+                        continue
+
                     wait = self._parse_retry_after(response)
                     if wait is None:
                         # fall back to exponential backoff proportional to attempt
@@ -1114,7 +1120,7 @@ class BaseCore:
             return url, b"", False
 
     def download(self, video, quality: str, downloader: str, path: str, callback=None, remux: bool = False,
-                 callback_remux=None) -> None:
+                 callback_remux=None, max_workers_download: int = 20) -> None:
         """
         :param video:
         :param callback:
@@ -1123,8 +1129,10 @@ class BaseCore:
         :param path:
         :param remux:
         :param callback_remux:
+        :param max_workers_download:
         :return:
         """
+        max_workers_download = max_workers_download or self.config.max_workers_download
 
         if callback is None:
             callback = Callback.text_progress_bar
@@ -1133,14 +1141,14 @@ class BaseCore:
             self.default(video=video, quality=quality, path=path, callback=callback, remux=remux, callback_remux=callback_remux)
 
         elif downloader == "threaded":
-            threaded_download = self.threaded(max_workers=20, timeout=10)
+            threaded_download = self.threaded(max_workers=max_workers_download, timeout=self.config.timeout)
             threaded_download(self, video=video, quality=quality, path=path, callback=callback, remux=remux,
                               callback_remux=callback_remux)
 
         elif downloader == "FFMPEG":
             self.FFMPEG(video=video, quality=quality, path=path, callback=callback)
 
-    def threaded(self, max_workers: int = 20, timeout: int = 10):
+    def threaded(self, max_workers: int, timeout: int):
         def wrapper(self, video, quality: str, callback, path: str, remux: bool = True, callback_remux=None):
             """
             This function has already been optimized a lot and is pretty much perfect in what's possible if we

{eaf_base_api-2.4.4 → eaf_base_api-2.4.6}/base_api/modules/config.py

@@ -12,6 +12,10 @@ class RuntimeConfig:
         self.cookies = None
         self.locale = "en-US,en;q=0.9" # If you override this, it could change regexes and thus make stuff not work...
         self.use_http2 = True
+        self.max_workers_download = 20
+        self.videos_concurrency = 5
+        self.pages_concurrency = 2
+
 
 # Singleton instance needed for my Porn Fetch project
 config = RuntimeConfig()

{eaf_base_api-2.4.4 → eaf_base_api-2.4.6/eaf_base_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.4.4
+Version: 2.4.6
 Summary: A base API for EchterAlsFake's Porn APIs
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
 License: LGPLv3

{eaf_base_api-2.4.4 → eaf_base_api-2.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eaf_base_api"
-version = "2.4.4"
+version = "2.4.6"
 description = "A base API for EchterAlsFake's Porn APIs"
 readme = "README.md"
 requires-python = ">=3.6"