datamarket 0.7.107__tar.gz → 0.7.108__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.7.107
+Version: 0.7.108
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.7.107"
+version = "0.7.108"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

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

@@ -1,3 +1,6 @@
+########################################################################################################################
+# IMPORTS
+
 import logging
 import random
 import time
@@ -10,12 +13,18 @@ from stem.control import Controller
 
 from datamarket.exceptions import EnsureNewIPTimeoutError, NoWorkingProxiesError
 
+########################################################################################################################
+# SETUP
+
 logger = logging.getLogger(__name__)
 logging.getLogger("stem").setLevel(logging.WARNING)
 
 PROXY_ROTATION_INTERVAL = timedelta(minutes=10)
 PROXY_ROTATION_TIMEOUT_SECONDS = int(PROXY_ROTATION_INTERVAL.total_seconds())
 
+########################################################################################################################
+# CLASSES
+
 
 class ProxyInterface:
     """
@@ -249,7 +258,9 @@ class ProxyInterface:
         # 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)
@@ -321,6 +332,7 @@ class ProxyInterface:
         raise NoWorkingProxiesError("No working proxies available")
 
     def _wait_for_new_ip(self, entry, baseline, timeout, interval, check_timeout):
+        logger.info("Refreshing proxy IP...")
         start = time.time()
         while time.time() - start < timeout:
             host, port, user, pwd = entry