datamarket 0.7.108__tar.gz → 0.7.109__tar.gz

{datamarket-0.7.108 → datamarket-0.7.109}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.7.108
+Version: 0.7.109
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket
 Author-email: techsupport@datamarket.es
-Requires-Python: >=3.12,<3.13
+Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: aws
 Provides-Extra: azure-storage-blob
 Provides-Extra: boto3

{datamarket-0.7.108 → datamarket-0.7.109}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.7.108"
+version = "0.7.109"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"
@@ -15,7 +15,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.12,<3.13"
+python = "^3.12"
 typer = "~0.15.0"
 SQLAlchemy = "^2.0.0"
 psycopg2-binary = "^2.0.0"

{datamarket-0.7.108 → datamarket-0.7.109}/src/datamarket/interfaces/proxy.py

@@ -5,6 +5,7 @@ import logging
 import random
 import time
 from datetime import timedelta
+from functools import partial
 
 import requests
 import tenacity
@@ -246,28 +247,36 @@ class ProxyInterface:
         cooldown_seconds=30,
         proxy_rotation_interval=PROXY_ROTATION_INTERVAL,
     ):
-        """Get a working proxy entry, performing health checks as needed."""
+        """Get a working proxy entry, performing health checks as needed.
+
+        - Fails fast if there are no entries.
+        - Optionally retries for up to `proxy_rotation_interval`,
+        refreshing the traversal queue before each attempt.
+        """
+
+        if not self.entries:
+            raise NoWorkingProxiesError("No proxies available")
+
         pool = self._build_pool(use_auth)
         self._refresh_traversal_queue(pool, randomize)
 
-        def _find_working_entry():
-            if not self.entries:
-                raise NoWorkingProxiesError("No proxies available")
-            return self._find_working_entry_once(check_timeout, cooldown_seconds)
-
-        # Handle both timedelta and numeric seconds for backward compatibility
-        if proxy_rotation_interval:
-            retrying = tenacity.Retrying(
-                wait=tenacity.wait_fixed(cooldown_seconds),
-                stop=tenacity.stop_after_delay(proxy_rotation_interval),
-                before_sleep=tenacity.before_sleep_log(logger, logging.INFO),
-                reraise=True,
-            )
-            entry = retrying(_find_working_entry)
-        else:
-            entry = _find_working_entry()
+        find_once = partial(self._find_working_entry_once, check_timeout, cooldown_seconds)
+
+        if not proxy_rotation_interval:
+            return find_once()
 
-        return entry
+        def before_sleep(retry_state):
+            tenacity.before_sleep_log(logger, logging.INFO)(retry_state)
+            self._refresh_traversal_queue(pool, randomize)
+
+        retrying = tenacity.Retrying(
+            wait=tenacity.wait_fixed(cooldown_seconds),
+            stop=tenacity.stop_after_delay(proxy_rotation_interval),
+            before_sleep=before_sleep,
+            retry=tenacity.retry_if_exception_type(NoWorkingProxiesError),
+            reraise=True,
+        )
+        return retrying(find_once)
 
     def _get_round_robin_candidates(self, pool):
         """Get candidates in round-robin order starting from current_index."""
@@ -329,6 +338,7 @@ class ProxyInterface:
                     self._traversal_queue.remove(idx)
                     return entry
 
+        self._traversal_queue = []
         raise NoWorkingProxiesError("No working proxies available")
 
     def _wait_for_new_ip(self, entry, baseline, timeout, interval, check_timeout):